1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
From: Urgau <urgau@numericable.fr>
Date: Thu, 3 Jul 2025 20:57:34 +0200
Subject: Always use the pure Rust fallback instead of
`llvm.{maximum,minimum}`
(cherry picked from commit 51857ade80c531c0ae0ee801dde5d425d13d38f8)
Forwarded: not-needed
---
compiler/rustc_codegen_llvm/src/intrinsic.rs | 26 ++++++++++++++------------
library/core/src/num/f64.rs | 4 ++--
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/compiler/rustc_codegen_llvm/src/intrinsic.rs b/compiler/rustc_codegen_llvm/src/intrinsic.rs
index f7f0628..47a4cbe 100644
--- a/compiler/rustc_codegen_llvm/src/intrinsic.rs
+++ b/compiler/rustc_codegen_llvm/src/intrinsic.rs
@@ -103,23 +103,25 @@ fn call_simple_intrinsic<'ll, 'tcx>(
sym::minnumf64 => ("llvm.minnum", &[bx.type_f64()]),
sym::minnumf128 => ("llvm.minnum", &[bx.type_f128()]),
- sym::minimumf16 => ("llvm.minimum", &[bx.type_f16()]),
- sym::minimumf32 => ("llvm.minimum", &[bx.type_f32()]),
- sym::minimumf64 => ("llvm.minimum", &[bx.type_f64()]),
- // There are issues on x86_64 and aarch64 with the f128 variant,
- // let's instead use the instrinsic fallback body.
- // sym::minimumf128 => ("llvm.minimum", &[cx.type_f128()]),
+ // FIXME: LLVM currently mis-compile those intrinsics, re-enable them
+ // when llvm/llvm-project#{139380,139381,140445} are fixed.
+ //sym::minimumf16 => ("llvm.minimum", &[bx.type_f16()]),
+ //sym::minimumf32 => ("llvm.minimum", &[bx.type_f32()]),
+ //sym::minimumf64 => ("llvm.minimum", &[bx.type_f64()]),
+ //sym::minimumf128 => ("llvm.minimum", &[cx.type_f128()]),
+ //
sym::maxnumf16 => ("llvm.maxnum", &[bx.type_f16()]),
sym::maxnumf32 => ("llvm.maxnum", &[bx.type_f32()]),
sym::maxnumf64 => ("llvm.maxnum", &[bx.type_f64()]),
sym::maxnumf128 => ("llvm.maxnum", &[bx.type_f128()]),
- sym::maximumf16 => ("llvm.maximum", &[bx.type_f16()]),
- sym::maximumf32 => ("llvm.maximum", &[bx.type_f32()]),
- sym::maximumf64 => ("llvm.maximum", &[bx.type_f64()]),
- // There are issues on x86_64 and aarch64 with the f128 variant,
- // let's instead use the instrinsic fallback body.
- // sym::maximumf128 => ("llvm.maximum", &[cx.type_f128()]),
+ // FIXME: LLVM currently mis-compile those intrinsics, re-enable them
+ // when llvm/llvm-project#{139380,139381,140445} are fixed.
+ //sym::maximumf16 => ("llvm.maximum", &[bx.type_f16()]),
+ //sym::maximumf32 => ("llvm.maximum", &[bx.type_f32()]),
+ //sym::maximumf64 => ("llvm.maximum", &[bx.type_f64()]),
+ //sym::maximumf128 => ("llvm.maximum", &[cx.type_f128()]),
+ //
sym::copysignf16 => ("llvm.copysign", &[bx.type_f16()]),
sym::copysignf32 => ("llvm.copysign", &[bx.type_f32()]),
sym::copysignf64 => ("llvm.copysign", &[bx.type_f64()]),
diff --git a/library/core/src/num/f64.rs b/library/core/src/num/f64.rs
index 2f10e6d..3cd079b 100644
--- a/library/core/src/num/f64.rs
+++ b/library/core/src/num/f64.rs
@@ -943,7 +943,7 @@ impl f64 {
/// This returns NaN when *either* argument is NaN, as opposed to
/// [`f64::max`] which only returns NaN when *both* arguments are NaN.
///
- /// ```ignore-arm-unknown-linux-gnueabihf (see https://github.com/rust-lang/rust/issues/141087)
+ /// ```
/// #![feature(float_minimum_maximum)]
/// let x = 1.0_f64;
/// let y = 2.0_f64;
@@ -970,7 +970,7 @@ impl f64 {
/// This returns NaN when *either* argument is NaN, as opposed to
/// [`f64::min`] which only returns NaN when *both* arguments are NaN.
///
- /// ```ignore-arm-unknown-linux-gnueabihf (see https://github.com/rust-lang/rust/issues/141087)
+ /// ```
/// #![feature(float_minimum_maximum)]
/// let x = 1.0_f64;
/// let y = 2.0_f64;
|
