nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

PassWrapper: adapt for llvm/llvm-project@d3d856ad84

Browse Source 
LLVM 21 moves to making it more explicit what this function call is
doing, but nothing has changed behaviorally, so for now we just adjust
to using the new name of the function.

@rustbot label llvm-main
This commit is contained in:
Augie Fackler 2025-04-28 11:29:35 -04:00
parent a932eb36f8
commit ff6dad436d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1365,7 +1365,12 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules, size_t num_modules,
// Convert the preserved symbols set from string to GUID, this is then needed // Convert the preserved symbols set from string to GUID, this is then needed
// for internalization. // for internalization.
for (size_t i = 0; i < num_symbols; i++) { for (size_t i = 0; i < num_symbols; i++) {
#if LLVM_VERSION_GE(21, 0)
auto GUID =
GlobalValue::getGUIDAssumingExternalLinkage(preserved_symbols[i]);
#else
auto GUID = GlobalValue::getGUID(preserved_symbols[i]); auto GUID = GlobalValue::getGUID(preserved_symbols[i]);
#endif
Ret->GUIDPreservedSymbols.insert(GUID); Ret->GUIDPreservedSymbols.insert(GUID);
} }
@ -1685,11 +1690,11 @@ extern "C" void LLVMRustComputeLTOCacheKey(RustStringRef KeyOut,
// Based on the 'InProcessThinBackend' constructor in LLVM // Based on the 'InProcessThinBackend' constructor in LLVM
#if LLVM_VERSION_GE(21, 0) #if LLVM_VERSION_GE(21, 0)
for (auto &Name : Data->Index.cfiFunctionDefs().symbols()) for (auto &Name : Data->Index.cfiFunctionDefs().symbols())
CfiFunctionDefs.insert( CfiFunctionDefs.insert(GlobalValue::getGUIDAssumingExternalLinkage(
GlobalValue::getGUID(GlobalValue::dropLLVMManglingEscape(Name))); GlobalValue::dropLLVMManglingEscape(Name)));
for (auto &Name : Data->Index.cfiFunctionDecls().symbols()) for (auto &Name : Data->Index.cfiFunctionDecls().symbols())
CfiFunctionDecls.insert( CfiFunctionDecls.insert(GlobalValue::getGUIDAssumingExternalLinkage(
GlobalValue::getGUID(GlobalValue::dropLLVMManglingEscape(Name))); GlobalValue::dropLLVMManglingEscape(Name)));
#else #else
for (auto &Name : Data->Index.cfiFunctionDefs()) for (auto &Name : Data->Index.cfiFunctionDefs())
CfiFunctionDefs.insert( CfiFunctionDefs.insert(