language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-03 05:13:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Only parse the object file once

Browse source
This commit is contained in:
Lukas Wirth 2024-12-12 13:20:08 +01:00
parent 16c0f25579
commit c9314d4aff
2 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/proc-macro-srv/src/dylib.rs
View file

@ -6,7 +6,6 @@ use proc_macro::bridge;
use std::{fmt, fs, io, time::SystemTime};
use libloading::Library;
use memmap2::Mmap;
use object::Object;
use paths::{Utf8Path, Utf8PathBuf};
use proc_macro_api::ProcMacroKind;
@ -23,8 +22,8 @@ fn is_derive_registrar_symbol(symbol: &str) -> bool {
symbol.contains(NEW_REGISTRAR_SYMBOL)
}
fn find_registrar_symbol(buffer: &[u8]) -> object::Result<Option<String>> {
Ok(object::File::parse(buffer)?
fn find_registrar_symbol(obj: &object::File<'_>) -> object::Result<Option<String>> {
Ok(obj
.exports()?
.into_iter()
.map(|export| export.name())
@ -109,15 +108,16 @@ struct ProcMacroLibraryLibloading {
impl ProcMacroLibraryLibloading {
fn open(path: &Utf8Path) -> Result<Self, LoadProcMacroDylibError> {
let buffer = unsafe { Mmap::map(&fs::File::open(path)?)? };
let file = fs::File::open(path)?;
let file = unsafe { memmap2::Mmap::map(&file) }?;
let obj = object::File::parse(&*file)
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
let version_info = version::read_dylib_info(&obj)?;
let symbol_name =
find_registrar_symbol(&buffer).map_err(invalid_data_err)?.ok_or_else(|| {
find_registrar_symbol(&obj).map_err(invalid_data_err)?.ok_or_else(|| {
invalid_data_err(format!("Cannot find registrar symbol in file {path}"))
})?;
let version_info = version::read_dylib_info(&buffer)?;
drop(buffer);
let lib = load_library(path).map_err(invalid_data_err)?;
let proc_macros = crate::proc_macros::ProcMacros::from_lib(
&lib,