-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Implement expand_task and list_macros in proc_macro_srv #3920
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.
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
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
f7f121d
Add dylib loading code
edwin0cheng e5698fa
Implement expand_task and list_macros
edwin0cheng 460ddde
Add tests
edwin0cheng 197039b
Remove allow(unused)
edwin0cheng 857c03d
Fix macos symbol name bug
edwin0cheng 5fc8f90
tidy up a bit
edwin0cheng 31d163a
Improve error handling
edwin0cheng File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,211 @@ | ||
//! Handles dynamic library loading for proc macro | ||
|
||
use crate::{proc_macro::bridge, rustc_server::TokenStream}; | ||
use std::path::Path; | ||
|
||
use goblin::{mach::Mach, Object}; | ||
use libloading::Library; | ||
use ra_proc_macro::ProcMacroKind; | ||
|
||
use std::io::Error as IoError; | ||
use std::io::ErrorKind as IoErrorKind; | ||
|
||
const NEW_REGISTRAR_SYMBOL: &str = "_rustc_proc_macro_decls_"; | ||
|
||
fn invalid_data_err(e: impl Into<Box<dyn std::error::Error + Send + Sync>>) -> IoError { | ||
IoError::new(IoErrorKind::InvalidData, e) | ||
} | ||
|
||
fn get_symbols_from_lib(file: &Path) -> Result<Vec<String>, IoError> { | ||
let buffer = std::fs::read(file)?; | ||
let object = Object::parse(&buffer).map_err(invalid_data_err)?; | ||
|
||
match object { | ||
Object::Elf(elf) => { | ||
let symbols = elf.dynstrtab.to_vec().map_err(invalid_data_err)?; | ||
let names = symbols.iter().map(|s| s.to_string()).collect(); | ||
Ok(names) | ||
} | ||
Object::PE(pe) => { | ||
let symbol_names = | ||
pe.exports.iter().flat_map(|s| s.name).map(|n| n.to_string()).collect(); | ||
Ok(symbol_names) | ||
} | ||
Object::Mach(mach) => match mach { | ||
Mach::Binary(binary) => { | ||
let exports = binary.exports().map_err(invalid_data_err)?; | ||
let names = exports | ||
.into_iter() | ||
.map(|s| { | ||
// 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.name.starts_with("_") { | ||
s.name[1..].to_string() | ||
} else { | ||
s.name | ||
} | ||
}) | ||
.collect(); | ||
Ok(names) | ||
} | ||
Mach::Fat(_) => Ok(vec![]), | ||
}, | ||
Object::Archive(_) | Object::Unknown(_) => Ok(vec![]), | ||
} | ||
} | ||
|
||
fn is_derive_registrar_symbol(symbol: &str) -> bool { | ||
symbol.contains(NEW_REGISTRAR_SYMBOL) | ||
} | ||
|
||
fn find_registrar_symbol(file: &Path) -> Result<Option<String>, IoError> { | ||
let symbols = get_symbols_from_lib(file)?; | ||
Ok(symbols.into_iter().find(|s| is_derive_registrar_symbol(s))) | ||
} | ||
|
||
/// Loads dynamic library in platform dependent manner. | ||
/// | ||
/// For unix, you have to use RTLD_DEEPBIND flag to escape problems described | ||
/// [here](https://github.com/fedochet/rust-proc-macro-panic-inside-panic-expample) | ||
/// and [here](https://github.com/rust-lang/rust/issues/60593). | ||
/// | ||
/// Usage of RTLD_DEEPBIND | ||
/// [here](https://github.com/fedochet/rust-proc-macro-panic-inside-panic-expample/issues/1) | ||
/// | ||
/// It seems that on Windows that behaviour is default, so we do nothing in that case. | ||
#[cfg(windows)] | ||
fn load_library(file: &Path) -> Result<Library, libloading::Error> { | ||
Library::new(file) | ||
} | ||
|
||
#[cfg(unix)] | ||
fn load_library(file: &Path) -> Result<Library, libloading::Error> { | ||
use libloading::os::unix::Library as UnixLibrary; | ||
use std::os::raw::c_int; | ||
|
||
const RTLD_NOW: c_int = 0x00002; | ||
const RTLD_DEEPBIND: c_int = 0x00008; | ||
|
||
UnixLibrary::open(Some(file), RTLD_NOW | RTLD_DEEPBIND).map(|lib| lib.into()) | ||
} | ||
|
||
struct ProcMacroLibraryLibloading { | ||
// Hold the dylib to prevent it for unloadeding | ||
_lib: Library, | ||
exported_macros: Vec<bridge::client::ProcMacro>, | ||
} | ||
|
||
impl ProcMacroLibraryLibloading { | ||
fn open(file: &Path) -> Result<Self, IoError> { | ||
let symbol_name = find_registrar_symbol(file)? | ||
.ok_or(invalid_data_err(format!("Cannot find registrar symbol in file {:?}", file)))?; | ||
|
||
let lib = load_library(file).map_err(invalid_data_err)?; | ||
let exported_macros = { | ||
let macros: libloading::Symbol<&&[bridge::client::ProcMacro]> = | ||
unsafe { lib.get(symbol_name.as_bytes()) }.map_err(invalid_data_err)?; | ||
macros.to_vec() | ||
}; | ||
|
||
Ok(ProcMacroLibraryLibloading { _lib: lib, exported_macros }) | ||
} | ||
} | ||
|
||
type ProcMacroLibraryImpl = ProcMacroLibraryLibloading; | ||
|
||
pub struct Expander { | ||
libs: Vec<ProcMacroLibraryImpl>, | ||
} | ||
|
||
impl Expander { | ||
pub fn new<P: AsRef<Path>>(lib: &P) -> Result<Expander, String> { | ||
let mut libs = vec![]; | ||
/* Some libraries for dynamic loading require canonicalized path (even when it is | ||
already absolute | ||
*/ | ||
let lib = | ||
lib.as_ref().canonicalize().expect(&format!("Cannot canonicalize {:?}", lib.as_ref())); | ||
|
||
let library = ProcMacroLibraryImpl::open(&lib).map_err(|e| e.to_string())?; | ||
libs.push(library); | ||
|
||
Ok(Expander { libs }) | ||
} | ||
|
||
pub fn expand( | ||
&self, | ||
macro_name: &str, | ||
macro_body: &ra_tt::Subtree, | ||
attributes: Option<&ra_tt::Subtree>, | ||
) -> Result<ra_tt::Subtree, bridge::PanicMessage> { | ||
let parsed_body = TokenStream::with_subtree(macro_body.clone()); | ||
|
||
let parsed_attributes = attributes | ||
.map_or(crate::rustc_server::TokenStream::new(), |attr| { | ||
TokenStream::with_subtree(attr.clone()) | ||
}); | ||
|
||
for lib in &self.libs { | ||
for proc_macro in &lib.exported_macros { | ||
match proc_macro { | ||
bridge::client::ProcMacro::CustomDerive { trait_name, client, .. } | ||
if *trait_name == macro_name => | ||
{ | ||
let res = client.run( | ||
&crate::proc_macro::bridge::server::SameThread, | ||
crate::rustc_server::Rustc::default(), | ||
parsed_body, | ||
); | ||
return res.map(|it| it.subtree); | ||
} | ||
bridge::client::ProcMacro::Bang { name, client } if *name == macro_name => { | ||
let res = client.run( | ||
&crate::proc_macro::bridge::server::SameThread, | ||
crate::rustc_server::Rustc::default(), | ||
parsed_body, | ||
); | ||
return res.map(|it| it.subtree); | ||
} | ||
bridge::client::ProcMacro::Attr { name, client } if *name == macro_name => { | ||
let res = client.run( | ||
&crate::proc_macro::bridge::server::SameThread, | ||
crate::rustc_server::Rustc::default(), | ||
parsed_attributes, | ||
parsed_body, | ||
); | ||
|
||
return res.map(|it| it.subtree); | ||
} | ||
_ => continue, | ||
} | ||
} | ||
} | ||
|
||
Err(bridge::PanicMessage::String("Nothing to expand".to_string())) | ||
} | ||
|
||
pub fn list_macros(&self) -> Result<Vec<(String, ProcMacroKind)>, bridge::PanicMessage> { | ||
let mut result = vec![]; | ||
|
||
for lib in &self.libs { | ||
for proc_macro in &lib.exported_macros { | ||
let res = match proc_macro { | ||
bridge::client::ProcMacro::CustomDerive { trait_name, .. } => { | ||
(trait_name.to_string(), ProcMacroKind::CustomDerive) | ||
} | ||
bridge::client::ProcMacro::Bang { name, .. } => { | ||
(name.to_string(), ProcMacroKind::FuncLike) | ||
} | ||
bridge::client::ProcMacro::Attr { name, .. } => { | ||
(name.to_string(), ProcMacroKind::Attr) | ||
} | ||
}; | ||
result.push(res); | ||
} | ||
} | ||
|
||
Ok(result) | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm, why we use an
=
dep here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is because we want to lock the version of proc macro to test with. They would change what
Serialize
to expand which may change the test result.