Update to ar_archive_writer 0.5.0

Author: dpaoliello

Cargo.lock

@@ -158,11 +158,11 @@ checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "ar_archive_writer"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01667f6f40216b9a0b2945e05fed5f1ad0ab6470e69cb9378001e37b1c0668e4"
+checksum = "3219abbb81fdcb1a976d794ea40cd8567b67c4e8f93bdcd077a40a0905f133e8"
 dependencies = [
- "object 0.36.7",
+ "object 0.37.2",
 ]
 
 [[package]]

compiler/rustc_codegen_llvm/src/back/archive.rs

@@ -26,6 +26,7 @@ static LLVM_OBJECT_READER: ObjectReader = ObjectReader {
     get_symbols: get_llvm_object_symbols,
     is_64_bit_object_file: llvm_is_64_bit_object_file,
     is_ec_object_file: llvm_is_ec_object_file,
+    is_any_arm64_coff: llvm_is_any_arm64_coff,
     get_xcoff_member_alignment: DEFAULT_OBJECT_READER.get_xcoff_member_alignment,
 };
 
@@ -95,3 +96,7 @@ fn llvm_is_64_bit_object_file(buf: &[u8]) -> bool {
 fn llvm_is_ec_object_file(buf: &[u8]) -> bool {
     unsafe { llvm::LLVMRustIsECObject(buf.as_ptr(), buf.len()) }
 }
+
+fn llvm_is_any_arm64_coff(buf: &[u8]) -> bool {
+    unsafe { llvm::LLVMRustIsAnyArm64Coff(buf.as_ptr(), buf.len()) }
+}

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -2632,6 +2632,8 @@ unsafe extern "C" {
 
     pub(crate) fn LLVMRustIsECObject(buf_ptr: *const u8, buf_len: usize) -> bool;
 
+    pub(crate) fn LLVMRustIsAnyArm64Coff(buf_ptr: *const u8, buf_len: usize) -> bool;
+
     pub(crate) fn LLVMRustSetNoSanitizeAddress(Global: &Value);
     pub(crate) fn LLVMRustSetNoSanitizeHWAddress(Global: &Value);
 }

compiler/rustc_codegen_ssa/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2024"
 
 [dependencies]
 # tidy-alphabetical-start
-ar_archive_writer = "0.4.2"
+ar_archive_writer = "0.5"
 bitflags = "2.4.1"
 bstr = "1.11.3"
 # `cc` updates often break things, so we pin it here. Cargo enforces "max 1 semver-compat version

compiler/rustc_codegen_ssa/src/back/archive.rs

@@ -46,7 +46,8 @@ impl From<ImportLibraryItem> for COFFShortExport {
             name: item.name,
             ext_name: None,
             symbol_name: item.symbol_name,
-            alias_target: None,
+            import_name: None,
+            export_as: None,
             ordinal: item.ordinal.unwrap_or(0),
             noname: item.ordinal.is_some(),
             data: item.is_data,
@@ -134,6 +135,7 @@ pub trait ArchiveBuilderBuilder {
                 // when linking a rust staticlib using `/WHOLEARCHIVE`.
                 // See #129020
                 true,
+                &[],
             ) {
                 sess.dcx()
                     .emit_fatal(ErrorCreatingImportLibrary { lib_name, error: error.to_string() });
@@ -527,7 +529,7 @@ impl<'a> ArArchiveBuilder<'a> {
             &entries,
             archive_kind,
             false,
-            /* is_ec = */ self.sess.target.arch == "arm64ec",
+            /* is_ec = */ Some(self.sess.target.arch == "arm64ec"),
         )?;
         archive_tmpfile.flush()?;
         drop(archive_tmpfile);

compiler/rustc_llvm/llvm-wrapper/SymbolWrapper.cpp

@@ -103,14 +103,14 @@ LLVMRustGetSymbols(char *BufPtr, size_t BufLen, void *State,
 #define TRUE_PTR (void *)1
 #define FALSE_PTR (void *)0
 
-extern "C" bool LLVMRustIs64BitSymbolicFile(char *BufPtr, size_t BufLen) {
+bool
+withBufferAsSymbolicFile(char *BufPtr, size_t BufLen,
+                         std::function<bool(object::SymbolicFile&)> Callback) {
   std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(
       StringRef(BufPtr, BufLen), StringRef("LLVMRustGetSymbolsObject"), false);
   SmallString<0> SymNameBuf;
   auto SymName = raw_svector_ostream(SymNameBuf);
 
-  // Code starting from this line is copied from s64BitSymbolicFile in
-  // ArchiveWriter.cpp.
   // In the scenario when LLVMContext is populated SymbolicFile will contain a
   // reference to it, thus SymbolicFile should be destroyed first.
   LLVMContext Context;
@@ -120,48 +120,62 @@ extern "C" bool LLVMRustIs64BitSymbolicFile(char *BufPtr, size_t BufLen) {
     return false;
   }
   std::unique_ptr<object::SymbolicFile> Obj = std::move(*ObjOrErr);
+  if (Obj == nullptr) {
+    return false;
+  }
+  return Callback(*Obj);
+}
 
-  return Obj != nullptr ? Obj->is64Bit() : false;
+extern "C" bool LLVMRustIs64BitSymbolicFile(char *BufPtr, size_t BufLen) {
+  return withBufferAsSymbolicFile(BufPtr, BufLen, [](object::SymbolicFile &Obj) {
+    return Obj.is64Bit();
+  });
 }
 
 extern "C" bool LLVMRustIsECObject(char *BufPtr, size_t BufLen) {
-  std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(
-      StringRef(BufPtr, BufLen), StringRef("LLVMRustGetSymbolsObject"), false);
-  SmallString<0> SymNameBuf;
-  auto SymName = raw_svector_ostream(SymNameBuf);
-
-  // In the scenario when LLVMContext is populated SymbolicFile will contain a
-  // reference to it, thus SymbolicFile should be destroyed first.
-  LLVMContext Context;
-  Expected<std::unique_ptr<object::SymbolicFile>> ObjOrErr =
-      getSymbolicFile(Buf->getMemBufferRef(), Context);
-  if (!ObjOrErr) {
-    return false;
-  }
-  std::unique_ptr<object::SymbolicFile> Obj = std::move(*ObjOrErr);
+  return withBufferAsSymbolicFile(BufPtr, BufLen, [](object::SymbolicFile &Obj) {
+    // Code starting from this line is copied from isECObject in
+    // ArchiveWriter.cpp with an extra #if to work with LLVM 17.
+    if (Obj.isCOFF())
+      return cast<llvm::object::COFFObjectFile>(&Obj)->getMachine() !=
+            COFF::IMAGE_FILE_MACHINE_ARM64;
+
+    if (Obj.isCOFFImportFile())
+      return cast<llvm::object::COFFImportFile>(&Obj)->getMachine() !=
+            COFF::IMAGE_FILE_MACHINE_ARM64;
+
+    if (Obj.isIR()) {
+      Expected<std::string> TripleStr =
+          getBitcodeTargetTriple(Obj.getMemoryBufferRef());
+      if (!TripleStr)
+        return false;
+      Triple T(*TripleStr);
+      return T.isWindowsArm64EC() || T.getArch() == Triple::x86_64;
+    }
 
-  if (Obj == nullptr) {
     return false;
-  }
+  });
+}
 
-  // Code starting from this line is copied from isECObject in
-  // ArchiveWriter.cpp with an extra #if to work with LLVM 17.
-  if (Obj->isCOFF())
-    return cast<llvm::object::COFFObjectFile>(&*Obj)->getMachine() !=
-           COFF::IMAGE_FILE_MACHINE_ARM64;
-
-  if (Obj->isCOFFImportFile())
-    return cast<llvm::object::COFFImportFile>(&*Obj)->getMachine() !=
-           COFF::IMAGE_FILE_MACHINE_ARM64;
-
-  if (Obj->isIR()) {
-    Expected<std::string> TripleStr =
-        getBitcodeTargetTriple(Obj->getMemoryBufferRef());
-    if (!TripleStr)
-      return false;
-    Triple T(*TripleStr);
-    return T.isWindowsArm64EC() || T.getArch() == Triple::x86_64;
-  }
+extern "C" bool LLVMRustIsAnyArm64Coff(char *BufPtr, size_t BufLen) {
+  return withBufferAsSymbolicFile(BufPtr, BufLen, [](object::SymbolicFile &Obj) {
+    // Code starting from this line is copied from isAnyArm64COFF in
+    // ArchiveWriter.cpp.
+    if (Obj.isCOFF())
+      return COFF::isAnyArm64(cast<COFFObjectFile>(&Obj)->getMachine());
+
+    if (Obj.isCOFFImportFile())
+      return COFF::isAnyArm64(cast<COFFImportFile>(&Obj)->getMachine());
+
+    if (Obj.isIR()) {
+      Expected<std::string> TripleStr =
+          getBitcodeTargetTriple(Obj.getMemoryBufferRef());
+      if (!TripleStr)
+        return false;
+      Triple T(*TripleStr);
+      return T.isOSWindows() && T.getArch() == Triple::aarch64;
+    }
 
-  return false;
+    return false;
+  });
 }