Skip to content

Commit 445658b

Browse files
committed
PassWrapper: update for LLVM change D102093
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.
1 parent c825bc4 commit 445658b

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

+12-1
Original file line numberDiff line numberDiff line change
@@ -789,16 +789,23 @@ LLVMRustOptimizeWithNewPassManager(
789789
PGOOpt = PGOOptions(PGOUsePath, "", "", PGOOptions::IRUse);
790790
}
791791

792-
#if LLVM_VERSION_GE(12, 0)
792+
#if LLVM_VERSION_GE(12, 0) && !LLVM_VERSION_GE(13,0)
793793
PassBuilder PB(DebugPassManager, TM, PTO, PGOOpt, &PIC);
794794
#else
795795
PassBuilder PB(TM, PTO, PGOOpt, &PIC);
796796
#endif
797797

798+
#if LLVM_VERSION_GE(13, 0)
799+
LoopAnalysisManager LAM;
800+
FunctionAnalysisManager FAM;
801+
CGSCCAnalysisManager CGAM;
802+
ModuleAnalysisManager MAM;
803+
#else
798804
LoopAnalysisManager LAM(DebugPassManager);
799805
FunctionAnalysisManager FAM(DebugPassManager);
800806
CGSCCAnalysisManager CGAM(DebugPassManager);
801807
ModuleAnalysisManager MAM(DebugPassManager);
808+
#endif
802809

803810
FAM.registerPass([&] { return PB.buildDefaultAAPipeline(); });
804811

@@ -935,7 +942,11 @@ LLVMRustOptimizeWithNewPassManager(
935942
}
936943
}
937944

945+
#if LLVM_VERSION_GE(13, 0)
946+
ModulePassManager MPM;
947+
#else
938948
ModulePassManager MPM(DebugPassManager);
949+
#endif
939950
bool NeedThinLTOBufferPasses = UseThinLTOBuffers;
940951
if (!NoPrepopulatePasses) {
941952
if (OptLevel == PassBuilder::OptimizationLevel::O0) {

0 commit comments

Comments
 (0)