diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-14 15:04:47 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-12-14 15:04:47 +0000 |
commit | 134c7563be05d120ffb45d9b971ba95735a0fcb5 (patch) | |
tree | fb9b8abb56b2569f58711765fda3d3404f3e01fa /crates/proc_macro_srv | |
parent | 8cba4231092b0d9ca44ea1f545856239e2fb6eed (diff) | |
parent | dc519b88aff2536a9c6cfdd12621ca73df26a5ef (diff) |
Merge #6817
6817: Replace goblin crate with object r=matklad a=lnicola
Continuation of #4385.
Co-authored-by: Laurențiu Nicola <[email protected]>
Diffstat (limited to 'crates/proc_macro_srv')
-rw-r--r-- | crates/proc_macro_srv/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/proc_macro_srv/src/dylib.rs | 65 |
2 files changed, 28 insertions, 39 deletions
diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml index 729372968..1bfa6c3fc 100644 --- a/crates/proc_macro_srv/Cargo.toml +++ b/crates/proc_macro_srv/Cargo.toml | |||
@@ -10,7 +10,7 @@ edition = "2018" | |||
10 | doctest = false | 10 | doctest = false |
11 | 11 | ||
12 | [dependencies] | 12 | [dependencies] |
13 | goblin = "0.2.1" | 13 | object = { version = "0.23", default-features = false, features = ["std", "read_core", "elf", "macho", "pe", "unaligned"] } |
14 | libloading = "0.6.0" | 14 | libloading = "0.6.0" |
15 | memmap = "0.7" | 15 | memmap = "0.7" |
16 | 16 | ||
diff --git a/crates/proc_macro_srv/src/dylib.rs b/crates/proc_macro_srv/src/dylib.rs index f8f705da8..2afb973cc 100644 --- a/crates/proc_macro_srv/src/dylib.rs +++ b/crates/proc_macro_srv/src/dylib.rs | |||
@@ -1,14 +1,17 @@ | |||
1 | //! Handles dynamic library loading for proc macro | 1 | //! Handles dynamic library loading for proc macro |
2 | 2 | ||
3 | use crate::{proc_macro::bridge, rustc_server::TokenStream}; | 3 | use std::{ |
4 | use std::fs::File; | 4 | fs::File, |
5 | use std::path::{Path, PathBuf}; | 5 | io, |
6 | path::{Path, PathBuf}, | ||
7 | }; | ||
6 | 8 | ||
7 | use goblin::{mach::Mach, Object}; | ||
8 | use libloading::Library; | 9 | use libloading::Library; |
9 | use memmap::Mmap; | 10 | use memmap::Mmap; |
11 | use object::Object; | ||
10 | use proc_macro_api::ProcMacroKind; | 12 | use proc_macro_api::ProcMacroKind; |
11 | use std::io; | 13 | |
14 | use crate::{proc_macro::bridge, rustc_server::TokenStream}; | ||
12 | 15 | ||
13 | const NEW_REGISTRAR_SYMBOL: &str = "_rustc_proc_macro_decls_"; | 16 | const NEW_REGISTRAR_SYMBOL: &str = "_rustc_proc_macro_decls_"; |
14 | 17 | ||
@@ -23,40 +26,26 @@ fn is_derive_registrar_symbol(symbol: &str) -> bool { | |||
23 | fn find_registrar_symbol(file: &Path) -> io::Result<Option<String>> { | 26 | fn find_registrar_symbol(file: &Path) -> io::Result<Option<String>> { |
24 | let file = File::open(file)?; | 27 | let file = File::open(file)?; |
25 | let buffer = unsafe { Mmap::map(&file)? }; | 28 | let buffer = unsafe { Mmap::map(&file)? }; |
26 | let object = Object::parse(&buffer).map_err(invalid_data_err)?; | ||
27 | 29 | ||
28 | let name = match object { | 30 | Ok(object::File::parse(&buffer) |
29 | Object::Elf(elf) => { | 31 | .map_err(invalid_data_err)? |
30 | let symbols = elf.dynstrtab.to_vec().map_err(invalid_data_err)?; | 32 | .exports() |
31 | symbols.into_iter().find(|s| is_derive_registrar_symbol(s)).map(&str::to_owned) | 33 | .map_err(invalid_data_err)? |
32 | } | 34 | .into_iter() |
33 | Object::PE(pe) => pe | 35 | .map(|export| export.name()) |
34 | .exports | 36 | .filter_map(|sym| String::from_utf8(sym.into()).ok()) |
35 | .iter() | 37 | .find(|sym| is_derive_registrar_symbol(sym)) |
36 | .flat_map(|s| s.name) | 38 | .map(|sym| { |
37 | .find(|s| is_derive_registrar_symbol(s)) | 39 | // From MacOS docs: |
38 | .map(&str::to_owned), | 40 | // https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/dlsym.3.html |
39 | Object::Mach(Mach::Binary(binary)) => { | 41 | // Unlike other dyld API's, the symbol name passed to dlsym() must NOT be |
40 | let exports = binary.exports().map_err(invalid_data_err)?; | 42 | // prepended with an underscore. |
41 | exports | 43 | if cfg!(target_os = "macos") && sym.starts_with('_') { |
42 | .iter() | 44 | sym[1..].to_owned() |
43 | .map(|s| { | 45 | } else { |
44 | // In macos doc: | 46 | sym |
45 | // https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/dlsym.3.html | 47 | } |
46 | // Unlike other dyld API's, the symbol name passed to dlsym() must NOT be | 48 | })) |
47 | // prepended with an underscore. | ||
48 | if s.name.starts_with('_') { | ||
49 | &s.name[1..] | ||
50 | } else { | ||
51 | &s.name | ||
52 | } | ||
53 | }) | ||
54 | .find(|s| is_derive_registrar_symbol(s)) | ||
55 | .map(&str::to_owned) | ||
56 | } | ||
57 | _ => return Ok(None), | ||
58 | }; | ||
59 | return Ok(name); | ||
60 | } | 49 | } |
61 | 50 | ||
62 | /// Loads dynamic library in platform dependent manner. | 51 | /// Loads dynamic library in platform dependent manner. |