From 43929a8a75d85ae3939a80703bdd827e81c51ba5 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Tue, 14 Jun 2022 15:11:14 +0000 Subject: [PATCH] Remove src_files and remove_file They only apply to the main source archive and their role can be fulfilled through the skip argument of add_archive too. --- .../rustc_codegen_cranelift/src/archive.rs | 13 -------- compiler/rustc_codegen_gcc/src/archive.rs | 13 -------- .../rustc_codegen_llvm/src/back/archive.rs | 29 ------------------ .../rustc_codegen_ssa/src/back/archive.rs | 2 -- compiler/rustc_codegen_ssa/src/back/link.rs | 30 +++++++++---------- 5 files changed, 14 insertions(+), 73 deletions(-) diff --git a/compiler/rustc_codegen_cranelift/src/archive.rs b/compiler/rustc_codegen_cranelift/src/archive.rs index a099e8b3a6a..4822c7e03a9 100644 --- a/compiler/rustc_codegen_cranelift/src/archive.rs +++ b/compiler/rustc_codegen_cranelift/src/archive.rs @@ -61,19 +61,6 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> { } } - fn src_files(&mut self) -> Vec { - self.entries.iter().map(|(name, _)| String::from_utf8(name.clone()).unwrap()).collect() - } - - fn remove_file(&mut self, name: &str) { - let index = self - .entries - .iter() - .position(|(entry_name, _)| entry_name == name.as_bytes()) - .expect("Tried to remove file not existing in src archive"); - self.entries.remove(index); - } - fn add_file(&mut self, file: &Path) { self.entries.push(( file.file_name().unwrap().to_str().unwrap().to_string().into_bytes(), diff --git a/compiler/rustc_codegen_gcc/src/archive.rs b/compiler/rustc_codegen_gcc/src/archive.rs index fac532f3e9c..1975035ae20 100644 --- a/compiler/rustc_codegen_gcc/src/archive.rs +++ b/compiler/rustc_codegen_gcc/src/archive.rs @@ -70,19 +70,6 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> { } } - fn src_files(&mut self) -> Vec { - self.entries.iter().map(|(name, _)| name.clone()).collect() - } - - fn remove_file(&mut self, name: &str) { - let index = self - .entries - .iter() - .position(|(entry_name, _)| entry_name == name) - .expect("Tried to remove file not existing in src archive"); - self.entries.remove(index); - } - fn add_file(&mut self, file: &Path) { self.entries.push(( file.file_name().unwrap().to_str().unwrap().to_string(), diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs index b3bbc062572..455c38ffb32 100644 --- a/compiler/rustc_codegen_llvm/src/back/archive.rs +++ b/compiler/rustc_codegen_llvm/src/back/archive.rs @@ -21,7 +21,6 @@ pub struct LlvmArchiveBuilder<'a> { sess: &'a Session, dst: PathBuf, src: Option, - removals: Vec, additions: Vec, src_archive: Option>, } @@ -65,35 +64,11 @@ impl<'a> ArchiveBuilder<'a> for LlvmArchiveBuilder<'a> { sess, dst: output.to_path_buf(), src: input.map(|p| p.to_path_buf()), - removals: Vec::new(), additions: Vec::new(), src_archive: None, } } - /// Removes a file from this archive - fn remove_file(&mut self, file: &str) { - self.removals.push(file.to_string()); - } - - /// Lists all files in an archive - fn src_files(&mut self) -> Vec { - if self.src_archive().is_none() { - return Vec::new(); - } - - let archive = self.src_archive.as_ref().unwrap().as_ref().unwrap(); - - archive - .iter() - .filter_map(|child| child.ok()) - .filter(is_relevant_child) - .filter_map(|child| child.name()) - .filter(|name| !self.removals.iter().any(|x| x == name)) - .map(|name| name.to_owned()) - .collect() - } - fn add_archive(&mut self, archive: &Path, skip: F) -> io::Result<()> where F: FnMut(&str) -> bool + 'static, @@ -296,7 +271,6 @@ impl<'a> LlvmArchiveBuilder<'a> { } fn build_with_llvm(&mut self, kind: ArchiveKind) -> io::Result<()> { - let removals = mem::take(&mut self.removals); let mut additions = mem::take(&mut self.additions); let mut strings = Vec::new(); let mut members = Vec::new(); @@ -308,9 +282,6 @@ impl<'a> LlvmArchiveBuilder<'a> { for child in archive.iter() { let child = child.map_err(string_to_io_error)?; let Some(child_name) = child.name() else { continue }; - if removals.iter().any(|r| r == child_name) { - continue; - } let name = CString::new(child_name)?; members.push(llvm::LLVMRustArchiveMemberNew( diff --git a/compiler/rustc_codegen_ssa/src/back/archive.rs b/compiler/rustc_codegen_ssa/src/back/archive.rs index a2f74b94214..1c9fc217ea4 100644 --- a/compiler/rustc_codegen_ssa/src/back/archive.rs +++ b/compiler/rustc_codegen_ssa/src/back/archive.rs @@ -45,8 +45,6 @@ pub trait ArchiveBuilder<'a> { fn new(sess: &'a Session, output: &Path, input: Option<&Path>) -> Self; fn add_file(&mut self, path: &Path); - fn remove_file(&mut self, name: &str); - fn src_files(&mut self) -> Vec; fn add_archive(&mut self, archive: &Path, skip: F) -> io::Result<()> where diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index e70509f3ecc..0f528c119f3 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -2466,17 +2466,19 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>( let name = &name[3..name.len() - 5]; // chop off lib/.rlib sess.prof.generic_activity_with_arg("link_altering_rlib", name).run(|| { - let mut archive = ::new(sess, &dst, Some(cratepath)); + let canonical_name = name.replace('-', "_"); + let upstream_rust_objects_already_included = + are_upstream_rust_objects_already_included(sess); + let is_builtins = sess.target.no_builtins + || !codegen_results.crate_info.is_no_builtins.contains(&cnum); - let mut any_objects = false; - for f in archive.src_files() { + let mut archive = ::new(sess, &dst, None); + if let Err(e) = archive.add_archive(cratepath, move |f| { if f == METADATA_FILENAME { - archive.remove_file(&f); - continue; + return true; } let canonical = f.replace('-', "_"); - let canonical_name = name.replace('-', "_"); let is_rust_object = canonical.starts_with(&canonical_name) && looks_like_rust_object_file(&f); @@ -2490,20 +2492,16 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>( // file, then we don't need the object file as it's part of the // LTO module. Note that `#![no_builtins]` is excluded from LTO, // though, so we let that object file slide. - let skip_because_lto = are_upstream_rust_objects_already_included(sess) - && is_rust_object - && (sess.target.no_builtins - || !codegen_results.crate_info.is_no_builtins.contains(&cnum)); + let skip_because_lto = + upstream_rust_objects_already_included && is_rust_object && is_builtins; if skip_because_cfg_say_so || skip_because_lto { - archive.remove_file(&f); - } else { - any_objects = true; + return true; } - } - if !any_objects { - return; + false + }) { + sess.fatal(&format!("failed to build archive from rlib: {}", e)); } archive.build(); link_upstream(&dst);