diff options
| author | bors <bors@rust-lang.org> | 2022-06-11 17:49:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-11 17:49:22 +0000 |
| commit | c08b235a5ce10167632bb0fddcd0c5d67f2d42e3 (patch) | |
| tree | 3fda5c65937c2aa5d1ced2e18e559a2589744ef4 /compiler/rustc_codegen_llvm/src | |
| parent | 85a26a9a96d3d0b1846cee97abbe6714dcbc6483 (diff) | |
| parent | 178cffe5634fa9c1207c2c7043830bec722a9d36 (diff) | |
| download | rust-c08b235a5ce10167632bb0fddcd0c5d67f2d42e3.tar.gz rust-c08b235a5ce10167632bb0fddcd0c5d67f2d42e3.zip | |
Auto merge of #97996 - matthiaskrgr:rollup-bvbjlid, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #97904 (Small grammar fix in the compile_error documentation) - #97943 (line 1352, change `self` to `*self`, other to `*other`) - #97969 (Make -Cpasses= only apply to pre-link optimization) - #97990 (Add more eslint checks) - #97994 (feat(fix): update some links in `hir.rs`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/write.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs index 50f8949c897..3864db9ffc1 100644 --- a/compiler/rustc_codegen_llvm/src/back/write.rs +++ b/compiler/rustc_codegen_llvm/src/back/write.rs @@ -463,7 +463,7 @@ pub(crate) unsafe fn optimize_with_new_llvm_pass_manager( let llvm_selfprofiler = llvm_profiler.as_mut().map(|s| s as *mut _ as *mut c_void).unwrap_or(std::ptr::null_mut()); - let extra_passes = config.passes.join(","); + let extra_passes = if !is_lto { config.passes.join(",") } else { "".to_string() }; let llvm_plugins = config.llvm_plugins.join(","); |