Rollup merge of rust-lang#115106 - durin42:llvm-18-symtabwritingmode, r=nikic

GuillaumeGomez · web-flow · commit 8c24ce115ea2 · 2023-08-23T17:46:35.000+02:00
ArchiveWrapper: handle LLVM API update In llvm/llvm-project@f740bcb a boolean parameter changed to an enum. r? ``@nikic`` ``@rustbot`` label: +llvm-main
diff --git a/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp
@@ -203,7 +203,12 @@ LLVMRustWriteArchive(char *Dst, size_t NumMembers,
     }
   }
 
+#if LLVM_VERSION_LT(18, 0)
   auto Result = writeArchive(Dst, Members, WriteSymbtab, Kind, true, false);
+#else
+  auto SymtabMode = WriteSymbtab ? SymtabWritingMode::NormalSymtab : SymtabWritingMode::NoSymtab;
+  auto Result = writeArchive(Dst, Members, SymtabMode, Kind, true, false);
+#endif
   if (!Result)
     return LLVMRustResult::Success;
   LLVMRustSetLastError(toString(std::move(Result)).c_str());

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,12 @@ LLVMRustWriteArchive(char *Dst, size_t NumMembers,`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
	`206`	`+#if LLVM_VERSION_LT(18, 0)`
`206`	`207`	`auto Result = writeArchive(Dst, Members, WriteSymbtab, Kind, true, false);`
	`208`	`+#else`
	`209`	`+ auto SymtabMode = WriteSymbtab ? SymtabWritingMode::NormalSymtab : SymtabWritingMode::NoSymtab;`
	`210`	`+ auto Result = writeArchive(Dst, Members, SymtabMode, Kind, true, false);`
	`211`	`+#endif`
`207`	`212`	`if (!Result)`
`208`	`213`	`return LLVMRustResult::Success;`
`209`	`214`	`LLVMRustSetLastError(toString(std::move(Result)).c_str());`