Skip to content

Fix osx mangling hack #717

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 1 commit into from
May 24, 2017
Merged

Fix osx mangling hack #717

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions src/ir/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,17 @@ fn get_abi(cc: CXCallingConv) -> Option<abi::Abi> {
}
}

// Mac os needs __ for mangled symbols but rust will automatically prepend the extra _.
// We need to make sure that we don't include __ because rust will turn into ___.
//
// TODO(emilio): This is wrong when the target system is not the host
// system. See https://github.com/servo/rust-bindgen/issues/593
fn macos_mangling(symbol: &mut String) {
if cfg!(target_os = "macos") && symbol.starts_with("_") {
symbol.remove(0);
}
}

/// Get the mangled name for the cursor's referent.
pub fn cursor_mangling(ctx: &BindgenContext,
cursor: &clang::Cursor)
Expand All @@ -127,7 +138,8 @@ pub fn cursor_mangling(ctx: &BindgenContext,
}

if let Ok(mut manglings) = cursor.cxx_manglings() {
if let Some(m) = manglings.pop() {
if let Some(mut m) = manglings.pop() {
macos_mangling(&mut m);
return Some(m);
}
}
Expand All @@ -137,13 +149,7 @@ pub fn cursor_mangling(ctx: &BindgenContext,
return None;
}

// Try to undo backend linkage munging (prepended _, generally)
//
// TODO(emilio): This is wrong when the target system is not the host
// system. See https://github.com/servo/rust-bindgen/issues/593
if cfg!(target_os = "macos") {
mangling.remove(0);
}
macos_mangling(&mut mangling);

if cursor.kind() == clang_sys::CXCursor_Destructor {
// With old (3.8-) libclang versions, and the Itanium ABI, clang returns
Expand Down