mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-02 15:32:06 +00:00
Auto merge of #94764 - nikic:update-llvm-3, r=nagisa
Update LLVM submodule This merges upstream changes from the 14.x release branch. Fixes #89609. Fixes #93923. Fixes #94032.
This commit is contained in:
commit
282778aee2
@ -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))
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit e29ac13bc97e26f886c3bfe72f9135e994c3cd0a
|
||||
Subproject commit c8eccf626fb5bb851b2ade93af8851ca1523807f
|
@ -1,5 +1,4 @@
|
||||
// run-pass
|
||||
// ignore-wasm32-bare FIXME(#93923) llvm miscompilation
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::path::Path;
|
||||
|
Loading…
Reference in New Issue
Block a user