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

PassWrapper: update for LLVM change D102093

Browse Source 
In https://reviews.llvm.org/D102093 lots of things stopped taking the
DebugLogging boolean parameter. Mercifully we appear to always set
DebugPassManager to false, so I don't think we're losing anything by not
passing this parameter.
This commit is contained in:
Augie Fackler 2021-05-17 14:12:38 -04:00
parent c825bc431e
commit 445658ba6d
1 changed files with 12 additions and 1 deletions

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

@ -789,16 +789,23 @@ LLVMRustOptimizeWithNewPassManager(
PGOOpt = PGOOptions(PGOUsePath, "", "", PGOOptions::IRUse); PGOOpt = PGOOptions(PGOUsePath, "", "", PGOOptions::IRUse);
} }
#if LLVM_VERSION_GE(12, 0) #if LLVM_VERSION_GE(12, 0) && !LLVM_VERSION_GE(13,0)
PassBuilder PB(DebugPassManager, TM, PTO, PGOOpt, &PIC); PassBuilder PB(DebugPassManager, TM, PTO, PGOOpt, &PIC);
#else #else
PassBuilder PB(TM, PTO, PGOOpt, &PIC); PassBuilder PB(TM, PTO, PGOOpt, &PIC);
#endif #endif
#if LLVM_VERSION_GE(13, 0)
LoopAnalysisManager LAM;
FunctionAnalysisManager FAM;
CGSCCAnalysisManager CGAM;
ModuleAnalysisManager MAM;
#else
LoopAnalysisManager LAM(DebugPassManager); LoopAnalysisManager LAM(DebugPassManager);
FunctionAnalysisManager FAM(DebugPassManager); FunctionAnalysisManager FAM(DebugPassManager);
CGSCCAnalysisManager CGAM(DebugPassManager); CGSCCAnalysisManager CGAM(DebugPassManager);
ModuleAnalysisManager MAM(DebugPassManager); ModuleAnalysisManager MAM(DebugPassManager);
#endif
FAM.registerPass([&] { return PB.buildDefaultAAPipeline(); }); FAM.registerPass([&] { return PB.buildDefaultAAPipeline(); });
@ -935,7 +942,11 @@ LLVMRustOptimizeWithNewPassManager(
} }
} }
#if LLVM_VERSION_GE(13, 0)
ModulePassManager MPM;
#else
ModulePassManager MPM(DebugPassManager); ModulePassManager MPM(DebugPassManager);
#endif
bool NeedThinLTOBufferPasses = UseThinLTOBuffers; bool NeedThinLTOBufferPasses = UseThinLTOBuffers;
if (!NoPrepopulatePasses) { if (!NoPrepopulatePasses) {
if (OptLevel == PassBuilder::OptimizationLevel::O0) { if (OptLevel == PassBuilder::OptimizationLevel::O0) {