Skip to content

Commit

Permalink
Auto merge of #94764 - nikic:update-llvm-3, r=nagisa
Browse files Browse the repository at this point in the history
Update LLVM submodule

This merges upstream changes from the 14.x release branch.

Fixes #89609.
Fixes #93923.
Fixes #94032.
  • Loading branch information
bors committed Mar 10, 2022
2 parents d7b282b + 6c58b5e commit 282778a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
9 changes: 5 additions & 4 deletions compiler/rustc_codegen_llvm/src/llvm_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,9 @@ pub(crate) fn should_use_new_llvm_pass_manager(user_opt: &Option<bool>, target_a
// The new pass manager is enabled by default for LLVM >= 13.
// This matches Clang, which also enables it since Clang 13.

// FIXME: There are some perf issues with the new pass manager
// when targeting s390x, so it is temporarily disabled for that
// arch, see https://github.com/rust-lang/rust/issues/89609
user_opt.unwrap_or_else(|| target_arch != "s390x" && llvm_util::get_version() >= (13, 0, 0))
// There are some perf issues with the new pass manager when targeting
// s390x with LLVM 13, so enable the new pass manager only with LLVM 14.
// See https://github.com/rust-lang/rust/issues/89609.
let min_version = if target_arch == "s390x" { 14 } else { 13 };
user_opt.unwrap_or_else(|| llvm_util::get_version() >= (min_version, 0, 0))
}
2 changes: 1 addition & 1 deletion src/llvm-project
Submodule llvm-project updated 775 files
1 change: 0 additions & 1 deletion src/test/ui/issues/issue-23036.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// run-pass
// ignore-wasm32-bare FIXME(#93923) llvm miscompilation

use std::collections::HashMap;
use std::path::Path;
Expand Down

0 comments on commit 282778a

Please sign in to comment.