bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

replace dynamic library module with libloading

Browse source
This commit is contained in:
Andy Russell 2021-11-08 18:03:55 -05:00
parent 0fb1c371d4
commit 923f939791
No known key found for this signature in database
GPG key ID: BE2221033EDBC374
15 changed files with 91 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_plugin_impl/Cargo.toml
View file

@ -8,6 +8,7 @@ edition = "2021"
doctest = false
[dependencies]
libloading = "0.7.1"
rustc_middle = { path = "../rustc_middle" }
rustc_errors = { path = "../rustc_errors" }
rustc_hir = { path = "../rustc_hir" }

42
compiler/rustc_plugin_impl/src/load.rs
View file

@ -1,6 +1,7 @@
//! Used by `rustc` when loading a plugin.
use crate::Registry;
use libloading::Library;
use rustc_ast::Crate;
use rustc_errors::struct_span_err;
use rustc_metadata::locator;
@ -56,37 +57,28 @@ fn load_plugin(
ident: Ident,
) {
let lib = locator::find_plugin_registrar(sess, metadata_loader, ident.span, ident.name);
let fun = dylink_registrar(sess, ident.span, lib);
let fun = dylink_registrar(lib).unwrap_or_else(|err| {
// This is fatal: there are almost certainly macros we need inside this crate, so
// continuing would spew "macro undefined" errors.
sess.span_fatal(ident.span, &err.to_string());
});
plugins.push(fun);
}
// Dynamically link a registrar function into the compiler process.
fn dylink_registrar(sess: &Session, span: Span, path: PathBuf) -> PluginRegistrarFn {
use rustc_metadata::dynamic_lib::DynamicLibrary;
/// Dynamically link a registrar function into the compiler process.
fn dylink_registrar(lib_path: PathBuf) -> Result<PluginRegistrarFn, libloading::Error> {
// Make sure the path contains a / or the linker will search for it.
let path = env::current_dir().unwrap().join(&path);
let lib_path = env::current_dir().unwrap().join(&lib_path);
let lib = match DynamicLibrary::open(&path) {
Ok(lib) => lib,
// this is fatal: there are almost certainly macros we need
// inside this crate, so continue would spew "macro undefined"
// errors
Err(err) => sess.span_fatal(span, &err),
};
let lib = unsafe { Library::new(&lib_path) }?;
unsafe {
let registrar = match lib.symbol("__rustc_plugin_registrar") {
Ok(registrar) => mem::transmute::<*mut u8, PluginRegistrarFn>(registrar),
// again fatal if we can't register macros
Err(err) => sess.span_fatal(span, &err),
};
let registrar_sym = unsafe { lib.get::<PluginRegistrarFn>(b"__rustc_plugin_registrar") }?;
// Intentionally leak the dynamic library. We can't ever unload it
// since the library can make things that will live arbitrarily long
// (e.g., an Rc cycle or a thread).
mem::forget(lib);
// Intentionally leak the dynamic library. We can't ever unload it
// since the library can make things that will live arbitrarily long
// (e.g., an Rc cycle or a thread).
let registrar_sym = unsafe { registrar_sym.into_raw() };
mem::forget(lib);
registrar
}
Ok(*registrar_sym)
}