Skip to content

Commit

Permalink
Rollup merge of #130509 - krasimirgg:llvm-20-2, r=nikic
Browse files Browse the repository at this point in the history
llvm-wrapper: adapt for LLVM API changes, second try

This is a re-work of #129749 after LLVM brought back the APIs used by rust.

No functional changes intended.

`@rustbot` label: +llvm-main
r? `@nikic`
cc: `@tmandry`
  • Loading branch information
matthiaskrgr authored Sep 18, 2024
2 parents 00c4be3 + 3a35288 commit 48b90aa
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,11 @@ struct LLVMRustThinLTOData {
// Not 100% sure what these are, but they impact what's internalized and
// what's inlined across modules, I believe.
#if LLVM_VERSION_GE(18, 0)
#if LLVM_VERSION_GE(20, 0)
FunctionImporter::ImportListsTy ImportLists;
#else
DenseMap<StringRef, FunctionImporter::ImportMapTy> ImportLists;
#endif
DenseMap<StringRef, FunctionImporter::ExportSetTy> ExportLists;
DenseMap<StringRef, GVSummaryMapTy> ModuleToDefinedGVSummaries;
#else
Expand Down

0 comments on commit 48b90aa

Please sign in to comment.