language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-29 02:52:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

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

@ -2,7 +2,7 @@
use std::io::{self, Read};
use object::read::{File as BinaryFile, Object, ObjectSection};
use object::read::{Object, ObjectSection};
#[derive(Debug)]
#[allow(dead_code)]
@ -16,14 +16,14 @@ pub struct RustCInfo {
}
/// Read rustc dylib information
pub fn read_dylib_info(buffer: &[u8]) -> io::Result<RustCInfo> {
pub fn read_dylib_info(obj: &object::File<'_>) -> io::Result<RustCInfo> {
macro_rules! err {
($e:literal) => {
io::Error::new(io::ErrorKind::InvalidData, $e)
};
}
let ver_str = read_version(buffer)?;
let ver_str = read_version(obj)?;
let mut items = ver_str.split_whitespace();
let tag = items.next().ok_or_else(|| err!("version format error"))?;
if tag != "rustc" {
@ -70,10 +70,8 @@ pub fn read_dylib_info(buffer: &[u8]) -> io::Result<RustCInfo> {
/// This is used inside read_version() to locate the ".rustc" section
/// from a proc macro crate's binary file.
fn read_section<'a>(dylib_binary: &'a [u8], section_name: &str) -> io::Result<&'a [u8]> {
BinaryFile::parse(dylib_binary)
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?
.section_by_name(section_name)
fn read_section<'a>(obj: &object::File<'a>, section_name: &str) -> io::Result<&'a [u8]> {
obj.section_by_name(section_name)
.ok_or_else(|| io::Error::new(io::ErrorKind::InvalidData, "section read error"))?
.data()
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))
@ -101,8 +99,8 @@ fn read_section<'a>(dylib_binary: &'a [u8], section_name: &str) -> io::Result<&'
///
/// Check this issue for more about the bytes layout:
/// <https://github.com/rust-lang/rust-analyzer/issues/6174>
pub fn read_version(buffer: &[u8]) -> io::Result<String> {
let dot_rustc = read_section(buffer, ".rustc")?;
pub fn read_version(obj: &object::File<'_>) -> io::Result<String> {
let dot_rustc = read_section(obj, ".rustc")?;
// check if magic is valid
if &dot_rustc[0..4] != b"rust" {
@ -151,10 +149,10 @@ pub fn read_version(buffer: &[u8]) -> io::Result<String> {
#[test]
fn test_version_check() {
let info = read_dylib_info(&unsafe {
memmap2::Mmap::map(&std::fs::File::open(crate::proc_macro_test_dylib_path()).unwrap())
.unwrap()
})
let info = read_dylib_info(
&object::File::parse(&*std::fs::read(crate::proc_macro_test_dylib_path()).unwrap())
.unwrap(),
)
.unwrap();
assert_eq!(