Skip to content

Commit fc81ad2

Browse files
committed
Auto merge of #85416 - durin42:llvm-catchup-may-2021, r=nagisa
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.
2 parents 237b1ef + 445658b commit fc81ad2

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
@@ -793,16 +793,23 @@ LLVMRustOptimizeWithNewPassManager(
793793
PGOOpt = PGOOptions(PGOUsePath, "", "", PGOOptions::IRUse);
794794
}
795795

796-
#if LLVM_VERSION_GE(12, 0)
796+
#if LLVM_VERSION_GE(12, 0) && !LLVM_VERSION_GE(13,0)
797797
PassBuilder PB(DebugPassManager, TM, PTO, PGOOpt, &PIC);
798798
#else
799799
PassBuilder PB(TM, PTO, PGOOpt, &PIC);
800800
#endif
801801

802+
#if LLVM_VERSION_GE(13, 0)
803+
LoopAnalysisManager LAM;
804+
FunctionAnalysisManager FAM;
805+
CGSCCAnalysisManager CGAM;
806+
ModuleAnalysisManager MAM;
807+
#else
802808
LoopAnalysisManager LAM(DebugPassManager);
803809
FunctionAnalysisManager FAM(DebugPassManager);
804810
CGSCCAnalysisManager CGAM(DebugPassManager);
805811
ModuleAnalysisManager MAM(DebugPassManager);
812+
#endif
806813

807814
FAM.registerPass([&] { return PB.buildDefaultAAPipeline(); });
808815

@@ -956,7 +963,11 @@ LLVMRustOptimizeWithNewPassManager(
956963
}
957964
}
958965

966+
#if LLVM_VERSION_GE(13, 0)
967+
ModulePassManager MPM;
968+
#else
959969
ModulePassManager MPM(DebugPassManager);
970+
#endif
960971
bool NeedThinLTOBufferPasses = UseThinLTOBuffers;
961972
if (!NoPrepopulatePasses) {
962973
if (OptLevel == PassBuilder::OptimizationLevel::O0) {

0 commit comments

Comments
 (0)