diff options
| author | Ralf Jung <post@ralfj.de> | 2025-04-02 23:54:22 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2025-04-02 23:54:22 +0200 |
| commit | e435ba32d85057070dba3f07fa8afd96799a0cfb (patch) | |
| tree | c989d04f4bcd32bcd93ed62208af68e1dbe36b6d /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | a3af09faa39d5a8d303a4cc2f80182e0f01baa7c (diff) | |
| parent | 64b58dd13b06a23d8429a73c225347b4cd3b2c3c (diff) | |
| download | rust-e435ba32d85057070dba3f07fa8afd96799a0cfb.tar.gz rust-e435ba32d85057070dba3f07fa8afd96799a0cfb.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp index 86f1bcc46ee..257bdc01993 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -855,10 +855,15 @@ extern "C" LLVMRustResult LLVMRustOptimize( } if (LintIR) { - PipelineStartEPCallbacks.push_back( - [](ModulePassManager &MPM, OptimizationLevel Level) { - MPM.addPass(createModuleToFunctionPassAdaptor(LintPass())); - }); + PipelineStartEPCallbacks.push_back([](ModulePassManager &MPM, + OptimizationLevel Level) { +#if LLVM_VERSION_GE(21, 0) + MPM.addPass( + createModuleToFunctionPassAdaptor(LintPass(/*AbortOnError=*/true))); +#else + MPM.addPass(createModuleToFunctionPassAdaptor(LintPass())); +#endif + }); } if (InstrumentCoverage) { |