itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix macos symbol name bug

Browse Source
This commit is contained in:
Edwin Cheng 2020-04-10 04:09:11 +08:00
parent 197039b9fe
commit 857c03df07
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/ra_proc_macro_srv/src/dylib.rs
View File

@ -57,10 +57,28 @@ fn is_derive_registrar_symbol(symbol: &str) -> bool {
symbol.contains(NEW_REGISTRAR_SYMBOL) symbol.contains(NEW_REGISTRAR_SYMBOL)
} }
#[cfg(not(target_os = "macos"))]
fn adjust_symbol_name(name: &str) -> String {
name.to_string()
}
#[cfg(target_os = "macos")]
fn adjust_symbol_name(s: &str) -> String {
// In macos doc:
// https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/dlsym.3.html
// Unlike other dyld API's, the symbol name passed to dlsym() must NOT be
// prepended with an underscore.
if s.starts_with("_") {
s[1..s.len()].to_string()
} else {
s.to_string()
}
}
fn find_registrar_symbol(file: &Path) -> Option<String> { fn find_registrar_symbol(file: &Path) -> Option<String> {
let symbols = get_symbols_from_lib(file)?; let symbols = get_symbols_from_lib(file)?;
symbols.iter().find(|s| is_derive_registrar_symbol(s)).map(|s| s.to_string()) symbols.iter().find(|s| is_derive_registrar_symbol(s)).map(|s| adjust_symbol_name(&s))
} }
/// Loads dynamic library in platform dependent manner. /// Loads dynamic library in platform dependent manner.