diff options
| author | Jieyou Xu <jieyouxu@outlook.com> | 2025-04-02 23:26:35 +0800 |
|---|---|---|
| committer | Jieyou Xu <jieyouxu@outlook.com> | 2025-04-02 23:26:35 +0800 |
| commit | cae5d8a81c6c5ce58909fdf1ee5679779a0b94fc (patch) | |
| tree | 8345c298b9e6a34f3f0d1064ba09042d67a6fc5c /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | 05d5fdadbbc5f426f2fe36b05c2b659865f2e4bb (diff) | |
| parent | ae9173d7dd4a31806c950c90dcc331f1508b4d17 (diff) | |
| download | rust-cae5d8a81c6c5ce58909fdf1ee5679779a0b94fc.tar.gz rust-cae5d8a81c6c5ce58909fdf1ee5679779a0b94fc.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) { |