mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #130509 - krasimirgg:llvm-20-2, r=nikic

Browse Source 
llvm-wrapper: adapt for LLVM API changes, second try

This is a re-work of https://github.com/rust-lang/rust/pull/129749 after LLVM brought back the APIs used by rust.

No functional changes intended.

`@rustbot` label: +llvm-main
r? `@nikic`
cc: `@tmandry`
This commit is contained in:
Matthias Krüger 2024-09-18 17:49:45 +02:00 committed by GitHub
commit 48b90aaed3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
View File

@ -1211,7 +1211,11 @@ struct LLVMRustThinLTOData {
// Not 100% sure what these are, but they impact what's internalized and // Not 100% sure what these are, but they impact what's internalized and
// what's inlined across modules, I believe. // what's inlined across modules, I believe.
#if LLVM_VERSION_GE(18, 0) #if LLVM_VERSION_GE(18, 0)
#if LLVM_VERSION_GE(20, 0)
FunctionImporter::ImportListsTy ImportLists;
#else
DenseMap<StringRef, FunctionImporter::ImportMapTy> ImportLists; DenseMap<StringRef, FunctionImporter::ImportMapTy> ImportLists;
#endif
DenseMap<StringRef, FunctionImporter::ExportSetTy> ExportLists; DenseMap<StringRef, FunctionImporter::ExportSetTy> ExportLists;
DenseMap<StringRef, GVSummaryMapTy> ModuleToDefinedGVSummaries; DenseMap<StringRef, GVSummaryMapTy> ModuleToDefinedGVSummaries;
#else #else