Skip to content

Commit 8fe3ffa

Browse files
authored
Rollup merge of rust-lang#120368 - klensy:llvm-fixme, r=nikic
llvm-wrapper: remove llvm 12 hack effectively reverts rust-lang@9a8acea r? `@nikic`
2 parents 9000bf6 + f1b5131 commit 8fe3ffa

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -945,12 +945,7 @@ LLVMRustOptimize(
945945
break;
946946
case LLVMRustOptStage::PreLinkThinLTO:
947947
MPM = PB.buildThinLTOPreLinkDefaultPipeline(OptLevel);
948-
// The ThinLTOPreLink pipeline already includes ThinLTOBuffer passes. However, callback
949-
// passes may still run afterwards. This means we need to run the buffer passes again.
950-
// FIXME: In LLVM 13, the ThinLTOPreLink pipeline also runs OptimizerLastEPCallbacks
951-
// before the RequiredLTOPreLinkPasses, in which case we can remove these hacks.
952-
if (OptimizerLastEPCallbacks.empty())
953-
NeedThinLTOBufferPasses = false;
948+
NeedThinLTOBufferPasses = false;
954949
for (const auto &C : OptimizerLastEPCallbacks)
955950
C(MPM, OptLevel);
956951
break;

0 commit comments

Comments
 (0)