From 41ff6a885f453780000023b9593ec7f36fa66c82 Mon Sep 17 00:00:00 2001
From: icedrocket <114203630+icedrocket@users.noreply.github.com>
Date: Fri, 10 Feb 2023 17:00:09 +0900
Subject: [PATCH 1/3] Update LLVM submodule
---
src/llvm-project | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/llvm-project b/src/llvm-project
index 477e7285b12..fd949f3034f 160000
--- a/src/llvm-project
+++ b/src/llvm-project
@@ -1 +1 @@
-Subproject commit 477e7285b12f876ad105188cfcfc8adda7dc29aa
+Subproject commit fd949f3034f8a422ecfffa889c2823485dde4bdd
From 313f04f4fff32ecf376c8af0e5d80e196f2bc056 Mon Sep 17 00:00:00 2001
From: icedrocket <114203630+icedrocket@users.noreply.github.com>
Date: Thu, 23 Feb 2023 08:39:23 +0900
Subject: [PATCH 2/3] Add regression test for #105626
---
tests/ui/numbers-arithmetic/issue-105626.rs | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 tests/ui/numbers-arithmetic/issue-105626.rs
diff --git a/tests/ui/numbers-arithmetic/issue-105626.rs b/tests/ui/numbers-arithmetic/issue-105626.rs
new file mode 100644
index 00000000000..f97edd510c9
--- /dev/null
+++ b/tests/ui/numbers-arithmetic/issue-105626.rs
@@ -0,0 +1,17 @@
+// run-pass
+// only-x86
+// min-system-llvm-version: 16
+// compile-flags: -Ctarget-feature=+sse2
+
+use std::hint::black_box;
+
+fn main() {
+ let n: i64 = black_box(0x3fffffdfffffff);
+ let r = f32::from_bits(0x5a7fffff);
+
+ assert_ne!((n as f64) as f32, n as f32);
+
+ // FIXME: these assertions fail if only x87 is enabled
+ assert_eq!(n as i64 as f32, r);
+ assert_eq!(n as u64 as f32, r);
+}
From 565de58dd705e6b4dc1adda0f96b102360276ef5 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 28 Feb 2023 10:25:05 -0800
Subject: [PATCH 3/3] Skip test `download_ci_llvm` with modified LLVM
---
src/bootstrap/config/tests.rs | 5 +++++
src/bootstrap/native.rs | 21 ++++++++++++---------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/bootstrap/config/tests.rs b/src/bootstrap/config/tests.rs
index 681ecbfeb5b..5a105007f21 100644
--- a/src/bootstrap/config/tests.rs
+++ b/src/bootstrap/config/tests.rs
@@ -11,6 +11,11 @@ fn parse(config: &str) -> Config {
#[test]
fn download_ci_llvm() {
+ if crate::native::is_ci_llvm_modified(&parse("")) {
+ eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change");
+ return;
+ }
+
let parse_llvm = |s| parse(s).llvm_from_ci;
let if_available = parse_llvm("llvm.download-ci-llvm = \"if-available\"");
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index 07d339c067c..31b22228934 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -216,21 +216,24 @@ pub(crate) fn is_ci_llvm_available(config: &Config, asserts: bool) -> bool {
}
}
- if CiEnv::is_ci() {
+ if is_ci_llvm_modified(config) {
+ eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change");
+ return false;
+ }
+
+ true
+}
+
+/// Returns true if we're running in CI with modified LLVM (and thus can't download it)
+pub(crate) fn is_ci_llvm_modified(config: &Config) -> bool {
+ CiEnv::is_ci() && {
// We assume we have access to git, so it's okay to unconditionally pass
// `true` here.
let llvm_sha = detect_llvm_sha(config, true);
let head_sha = output(config.git().arg("rev-parse").arg("HEAD"));
let head_sha = head_sha.trim();
- if llvm_sha == head_sha {
- eprintln!(
- "Detected LLVM as non-available: running in CI and modified LLVM in this change"
- );
- return false;
- }
+ llvm_sha == head_sha
}
-
- true
}
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]