Skip to content

Commit 48b90aa

Browse files
authored
Rollup merge of rust-lang#130509 - krasimirgg:llvm-20-2, r=nikic
llvm-wrapper: adapt for LLVM API changes, second try This is a re-work of rust-lang#129749 after LLVM brought back the APIs used by rust. No functional changes intended. `@rustbot` label: +llvm-main r? `@nikic` cc: `@tmandry`
2 parents 00c4be3 + 3a35288 commit 48b90aa

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,11 @@ struct LLVMRustThinLTOData {
12111211
// Not 100% sure what these are, but they impact what's internalized and
12121212
// what's inlined across modules, I believe.
12131213
#if LLVM_VERSION_GE(18, 0)
1214+
#if LLVM_VERSION_GE(20, 0)
1215+
FunctionImporter::ImportListsTy ImportLists;
1216+
#else
12141217
DenseMap<StringRef, FunctionImporter::ImportMapTy> ImportLists;
1218+
#endif
12151219
DenseMap<StringRef, FunctionImporter::ExportSetTy> ExportLists;
12161220
DenseMap<StringRef, GVSummaryMapTy> ModuleToDefinedGVSummaries;
12171221
#else

0 commit comments

Comments
 (0)