diff options
| author | bors <bors@rust-lang.org> | 2022-08-16 05:13:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-16 05:13:38 +0000 |
| commit | 8556e6620e4866526b3cea767ad8c20ae877a569 (patch) | |
| tree | 13d9f9ec09bd402a73d9e1e01f5b6bef7f486544 /compiler/rustc_codegen_llvm/src/llvm_util.rs | |
| parent | ef9810a3e2a9a16e79176cb0d3466ea82d239942 (diff) | |
| parent | 88af506e948d3a5e1aca5fe68a2d926d7cabefdd (diff) | |
| download | rust-8556e6620e4866526b3cea767ad8c20ae877a569.tar.gz rust-8556e6620e4866526b3cea767ad8c20ae877a569.zip | |
Auto merge of #100611 - matthiaskrgr:rollup-rxj10ur, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #100338 (when there are 3 or more return statements in the loop) - #100384 (Add support for generating unique profraw files by default when using `-C instrument-coverage`) - #100460 (Update the minimum external LLVM to 13) - #100567 (Add missing closing quote) - #100590 (Suggest adding an array length if possible) - #100600 (Rename Machine memory hooks to suggest when they run) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm_util.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm_util.rs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index 96d238eda59..f5d676c44e3 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -92,16 +92,6 @@ unsafe fn configure_llvm(sess: &Session) { add("-generate-arange-section", false); } - // Disable the machine outliner by default in LLVM versions 11 and LLVM - // version 12, where it leads to miscompilation. - // - // Ref: - // - https://github.com/rust-lang/rust/issues/85351 - // - https://reviews.llvm.org/D103167 - if llvm_util::get_version() < (13, 0, 0) { - add("-enable-machine-outliner=never", false); - } - match sess.opts.unstable_opts.merge_functions.unwrap_or(sess.target.merge_functions) { MergeFunctions::Disabled | MergeFunctions::Trampolines => {} MergeFunctions::Aliases => { |