Skip to content

Implement current_dll_path for AIX #109522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 31, 2023
Merged

Implement current_dll_path for AIX #109522

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e8a828
Implement current_dll_path for AIX
Mar 23, 2023
5aad510
Avoid misalign
Mar 24, 2023
82bfdc8
Address comment
Mar 28, 2023
49f63eb
Check data segment range
Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions compiler/rustc_session/src/filesearch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ fn current_dll_path() -> Result<PathBuf, String> {
use std::ffi::{CStr, OsStr};
use std::os::unix::prelude::*;

#[cfg(not(target_os = "aix"))]
unsafe {
let addr = current_dll_path as usize as *mut _;
let mut info = std::mem::zeroed();
Expand All @@ -80,6 +81,39 @@ fn current_dll_path() -> Result<PathBuf, String> {
let os = OsStr::from_bytes(bytes);
Ok(PathBuf::from(os))
}

#[cfg(target_os = "aix")]
unsafe {
let addr = current_dll_path as u64;
let mut buffer = vec![0i8; 4096];
Copy link
Member

@Noratrieb Noratrieb Mar 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may not be properly aligned for ld_info (it probably will in practice but we shouldn't rely on it). You should use a vec![std::mem::zeroed::<libc::ld_info>(); N] instead (and make sure to properly translate the length when calling loadquery).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good point.

loop {
if libc::loadquery(libc::L_GETINFO, buffer.as_mut_ptr(), buffer.len() as u32) >= 0 {
break;
} else {
if std::io::Error::last_os_error().raw_os_error().unwrap() != libc::ENOMEM {
return Err("loadquery failed".into());
}
buffer.resize(buffer.len() * 2, 0i8);
}
}
let mut current = buffer.as_mut_ptr() as *mut libc::ld_info;
loop {
let data_base = (*current).ldinfo_dataorg as u64;
let data_end = data_base + (*current).ldinfo_datasize;
let text_base = (*current).ldinfo_textorg as u64;
let text_end = text_base + (*current).ldinfo_textsize;
if (data_base <= addr && addr < data_end) || (text_base <= addr && addr < text_end) {
let bytes = CStr::from_ptr(&(*current).ldinfo_filename[0]).to_bytes();
let os = OsStr::from_bytes(bytes);
return Ok(PathBuf::from(os));
}
if (*current).ldinfo_next == 0 {
break;
}
current = ((current as u64) + ((*current).ldinfo_next) as u64) as *mut libc::ld_info;
}
return Err(format!("current dll's address {} is not in the load map", addr));
}
}

#[cfg(windows)]
Expand Down