Skip to content

Rollup of 8 pull requests #138459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Mar 13, 2025
Merged

Rollup of 8 pull requests #138459

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8c0475e
Update mdbook to 0.4.47
ehuss Mar 12, 2025
03c1b43
minor interpret cleanups
RalfJung Mar 12, 2025
eb2e421
Adapt to LLVM dropping CfiFunctionIndex::begin()/end()
zmodem Mar 12, 2025
5ec462e
Don't emit error within cast function, propagate it as a CastError
compiler-errors Mar 12, 2025
7a08d03
Add an opt-out in pretty printing for RTN rendering
compiler-errors Mar 12, 2025
2c0ad9d
Remove `feature = "hash_raw_entry"`
cuviper Feb 26, 2025
0434013
Fix RISC-V VxWorks LLVM target triples
madsmtm Mar 12, 2025
63447f2
Delegation: allow foreign fns `reuse`
Bryanskiy Mar 12, 2025
b5955e7
Rollup merge of #138126 - compiler-errors:rtn-for-sugg, r=oli-obk
matthiaskrgr Mar 13, 2025
41d6e6e
Rollup merge of #138399 - Bryanskiy:delegation-extern-fn, r=petrochenkov
matthiaskrgr Mar 13, 2025
6db8e5a
Rollup merge of #138406 - ehuss:update-mdbook, r=jieyouxu
matthiaskrgr Mar 13, 2025
9339bc6
Rollup merge of #138417 - RalfJung:interpret-cleanup, r=oli-obk
matthiaskrgr Mar 13, 2025
4c20fe8
Rollup merge of #138420 - zmodem:cfifunctionindex_fix, r=durin42
matthiaskrgr Mar 13, 2025
962b646
Rollup merge of #138423 - compiler-errors:delay-emit, r=WaffleLapkin
matthiaskrgr Mar 13, 2025
883f00c
Rollup merge of #138425 - cuviper:remove-hash_raw_entry, r=jhpratt
matthiaskrgr Mar 13, 2025
69b3ad1
Rollup merge of #138427 - madsmtm:vxworks-llvm-target, r=jieyouxu
matthiaskrgr Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adapt to LLVM dropping CfiFunctionIndex::begin()/end() 
After llvm/llvm-project#130382, RustWrapper
needs to call CfiFunctionIndex::symbols() instead.
  • Loading branch information
@zmodem
zmodem committed Mar 12, 2025
commit eb2e421e36e6de25a0a9b95cb461a266a48c91c2
9 changes: 9 additions & 0 deletions compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading