From 9f1cfec299a1060bdd8382d3e6a6ebd8dc64d3ab Mon Sep 17 00:00:00 2001
From: Henry Jiang <henry.jiang1@ibm.com>
Date: Mon, 25 Nov 2024 11:15:50 -0500
Subject: [PATCH] use ReadCache for archive loading
---
compiler/rustc_metadata/src/creader.rs | 2 +-
src/bootstrap/Cargo.toml | 2 +-
src/bootstrap/src/utils/helpers.rs | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/compiler/rustc_metadata/src/creader.rs b/compiler/rustc_metadata/src/creader.rs
index ebae968d005d6..007d9265165ff 100644
--- a/compiler/rustc_metadata/src/creader.rs
+++ b/compiler/rustc_metadata/src/creader.rs
@@ -1172,7 +1172,7 @@ fn attempt_load_dylib(path: &Path) -> Result<libloading::Library, libloading::Er
// the expected format is lib<name>.a(libname.so) for the actual
// dynamic library
let library_name = path.file_stem().expect("expect a library name");
- let mut archive_member = OsString::from("a(");
+ let mut archive_member = std::ffi::OsString::from("a(");
archive_member.push(library_name);
archive_member.push(".so)");
let new_path = path.with_extension(archive_member);
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
index 1aa49fa39ffbf..fcd97b7b5898f 100644
--- a/src/bootstrap/Cargo.toml
+++ b/src/bootstrap/Cargo.toml
@@ -47,7 +47,7 @@ fd-lock = "4.0"
home = "0.5"
ignore = "0.4"
libc = "0.2"
-object = { version = "0.36.3", default-features = false, features = ["archive", "coff", "read_core", "unaligned"] }
+object = { version = "0.36.3", default-features = false, features = ["archive", "coff", "read_core", "std", "unaligned"] }
opener = "0.5"
semver = "1.0"
serde = "1.0"
diff --git a/src/bootstrap/src/utils/helpers.rs b/src/bootstrap/src/utils/helpers.rs
index 9ca036a2afd43..079213e8c3da3 100644
--- a/src/bootstrap/src/utils/helpers.rs
+++ b/src/bootstrap/src/utils/helpers.rs
@@ -61,18 +61,18 @@ pub fn is_dylib(path: &Path) -> bool {
}
fn is_aix_shared_archive(path: &Path) -> bool {
- // FIXME(#133268): reading the entire file as &[u8] into memory seems excessive
- // look into either mmap it or use the ReadCache
- let data = match fs::read(path) {
- Ok(data) => data,
+ let file = match fs::File::open(path) {
+ Ok(file) => file,
Err(_) => return false,
};
- let file = match ArchiveFile::parse(&*data) {
- Ok(file) => file,
+ let reader = object::ReadCache::new(file);
+ let archive = match ArchiveFile::parse(&reader) {
+ Ok(result) => result,
Err(_) => return false,
};
- file.members()
+ archive
+ .members()
.filter_map(Result::ok)
.any(|entry| String::from_utf8_lossy(entry.name()).contains(".so"))
}