diff options
| author | bors <bors@rust-lang.org> | 2025-03-13 19:46:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-13 19:46:35 +0000 |
| commit | cbfdf0b014cb04982a9cbeec1578001001167f6e (patch) | |
| tree | 444bd71dd924bcc8cdc04e511f1f7e31ddfc1935 /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | 52daa7d835e7ff51cb387340082bf9a59b949738 (diff) | |
| parent | 69b3ad18d22180a27ecc7b5649c5665006f4209d (diff) | |
| download | rust-cbfdf0b014cb04982a9cbeec1578001001167f6e.tar.gz rust-cbfdf0b014cb04982a9cbeec1578001001167f6e.zip | |
Auto merge of #138459 - matthiaskrgr:rollup-hddfg18, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #138126 (Add an opt-out in pretty printing for RTN rendering) - #138399 (Delegation: allow foreign fns `reuse`) - #138406 (Update mdbook to 0.4.47) - #138417 (minor interpreter cleanups) - #138420 (Adapt to LLVM dropping CfiFunctionIndex::begin()/end()) - #138423 (Don't emit error within cast function, propagate it as a `CastError`) - #138425 (Remove `feature = "hash_raw_entry"`) - #138427 (Fix RISC-V VxWorks LLVM target triples) 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 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp index bc3d4d6f83a..86f1bcc46ee 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -1682,12 +1682,21 @@ extern "C" void LLVMRustComputeLTOCacheKey(RustStringRef KeyOut, #endif // Based on the 'InProcessThinBackend' constructor in LLVM +#if LLVM_VERSION_GE(21, 0) + for (auto &Name : Data->Index.cfiFunctionDefs().symbols()) + CfiFunctionDefs.insert( + GlobalValue::getGUID(GlobalValue::dropLLVMManglingEscape(Name))); + for (auto &Name : Data->Index.cfiFunctionDecls().symbols()) + CfiFunctionDecls.insert( + GlobalValue::getGUID(GlobalValue::dropLLVMManglingEscape(Name))); +#else for (auto &Name : Data->Index.cfiFunctionDefs()) CfiFunctionDefs.insert( GlobalValue::getGUID(GlobalValue::dropLLVMManglingEscape(Name))); for (auto &Name : Data->Index.cfiFunctionDecls()) CfiFunctionDecls.insert( GlobalValue::getGUID(GlobalValue::dropLLVMManglingEscape(Name))); +#endif #if LLVM_VERSION_GE(20, 0) Key = llvm::computeLTOCacheKey(conf, Data->Index, ModId, ImportList, |