diff options
| author | bors <bors@rust-lang.org> | 2024-09-18 17:51:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-18 17:51:26 +0000 |
| commit | f79a912d9edc3ad4db910c0e93672ed5c65133fa (patch) | |
| tree | bf50bb9019c80e56bbfc5451c54caa68035b17e6 /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | 7fc70f870a1d11c3b104274d3a18112996cdec9a (diff) | |
| parent | c0951bbce262aab3c0dfdd9f3ebbc0bdf7543173 (diff) | |
| download | rust-f79a912d9edc3ad4db910c0e93672ed5c65133fa.tar.gz rust-f79a912d9edc3ad4db910c0e93672ed5c65133fa.zip | |
Auto merge of #130519 - matthiaskrgr:rollup-l1hok4x, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #130457 (Cleanup codegen traits) - #130471 (Add zlib to musl dist image so rust-lld will support zlib compression for debug info there.) - #130507 (Improve handling of raw-idents in check-cfg) - #130509 (llvm-wrapper: adapt for LLVM API changes, second try) - #130510 (doc: the source of `LetStmt` can also be `AssignDesugar`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp index 4a4ba165b57..7ceb50f2a9e 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -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 |