Skip to content

Commit c5295ac

Browse files
borsbors
committed
Auto merge of #61408 - varkor:fmin-fmax-llvm-intrinsics, r=alexcrichton
Use LLVM intrinsics for floating-point min/max Resurrection of #46926, now that the optimisation issues are fixed. I've confirmed locally that #61384 solves the issues. I'm not sure if we're allowed to move the `min`/`max` methods from libcore to libstd: I can't quite tell what the status is from #50145. However, this is necessary to use the intrinsics. Fixes #18384. r? @SimonSapin cc @rkruppe @nikic
2 parents 5eeb567 + 0e5edc9 commit c5295ac

File tree

8 files changed

+102
-57
lines changed

8 files changed

+102
-57
lines changed

‎Cargo.lock‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies = [
2525
name = "alloc"
2626
version = "0.0.0"
2727
dependencies = [
28-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
28+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
2929
"core 0.0.0",
3030
"rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
3131
"rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -118,7 +118,7 @@ dependencies = [
118118
"autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
119119
"backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
120120
"cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
121-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
121+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
122122
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
123123
"rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
124124
"rustc-std-workspace-core 1.0.0",
@@ -130,7 +130,7 @@ version = "0.1.27"
130130
source = "registry+https://github.com/rust-lang/crates.io-index"
131131
dependencies = [
132132
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
133-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
133+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
134134
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
135135
"rustc-std-workspace-core 1.0.0",
136136
]
@@ -357,7 +357,7 @@ name = "cfg-if"
357357
version = "0.1.8"
358358
source = "registry+https://github.com/rust-lang/crates.io-index"
359359
dependencies = [
360-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
360+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
361361
"rustc-std-workspace-core 1.0.0",
362362
]
363363

@@ -486,7 +486,7 @@ dependencies = [
486486

487487
[[package]]
488488
name = "compiler_builtins"
489-
version = "0.1.15"
489+
version = "0.1.16"
490490
source = "registry+https://github.com/rust-lang/crates.io-index"
491491
dependencies = [
492492
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -768,7 +768,7 @@ name = "dlmalloc"
768768
version = "0.1.3"
769769
source = "registry+https://github.com/rust-lang/crates.io-index"
770770
dependencies = [
771-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
771+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
772772
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
773773
"rustc-std-workspace-core 1.0.0",
774774
]
@@ -934,7 +934,7 @@ name = "fortanix-sgx-abi"
934934
version = "0.3.2"
935935
source = "registry+https://github.com/rust-lang/crates.io-index"
936936
dependencies = [
937-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
937+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
938938
"rustc-std-workspace-core 1.0.0",
939939
]
940940

@@ -1095,7 +1095,7 @@ name = "hashbrown"
10951095
version = "0.4.0"
10961096
source = "registry+https://github.com/rust-lang/crates.io-index"
10971097
dependencies = [
1098-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
1098+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
10991099
"rustc-std-workspace-alloc 1.0.0",
11001100
"rustc-std-workspace-core 1.0.0",
11011101
]
@@ -1803,7 +1803,7 @@ dependencies = [
18031803
name = "panic_abort"
18041804
version = "0.0.0"
18051805
dependencies = [
1806-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
1806+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
18071807
"core 0.0.0",
18081808
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
18091809
]
@@ -1813,7 +1813,7 @@ name = "panic_unwind"
18131813
version = "0.0.0"
18141814
dependencies = [
18151815
"alloc 0.0.0",
1816-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
1816+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
18171817
"core 0.0.0",
18181818
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
18191819
"unwind 0.0.0",
@@ -1998,7 +1998,7 @@ name = "profiler_builtins"
19981998
version = "0.0.0"
19991999
dependencies = [
20002000
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
2001-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
2001+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
20022002
"core 0.0.0",
20032003
]
20042004

@@ -2518,7 +2518,7 @@ name = "rustc-demangle"
25182518
version = "0.1.15"
25192519
source = "registry+https://github.com/rust-lang/crates.io-index"
25202520
dependencies = [
2521-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
2521+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
25222522
"rustc-std-workspace-core 1.0.0",
25232523
]
25242524

@@ -2646,7 +2646,7 @@ dependencies = [
26462646
"alloc 0.0.0",
26472647
"build_helper 0.1.0",
26482648
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
2649-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
2649+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
26502650
"core 0.0.0",
26512651
]
26522652

@@ -2878,7 +2878,7 @@ dependencies = [
28782878
"alloc 0.0.0",
28792879
"build_helper 0.1.0",
28802880
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
2881-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
2881+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
28822882
"core 0.0.0",
28832883
]
28842884

@@ -2941,7 +2941,7 @@ dependencies = [
29412941
"alloc 0.0.0",
29422942
"build_helper 0.1.0",
29432943
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
2944-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
2944+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
29452945
"core 0.0.0",
29462946
]
29472947

@@ -3060,7 +3060,7 @@ dependencies = [
30603060
"alloc 0.0.0",
30613061
"build_helper 0.1.0",
30623062
"cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
3063-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
3063+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
30643064
"core 0.0.0",
30653065
]
30663066

@@ -3338,7 +3338,7 @@ dependencies = [
33383338
"alloc 0.0.0",
33393339
"backtrace 0.3.29 (registry+https://github.com/rust-lang/crates.io-index)",
33403340
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
3341-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
3341+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
33423342
"core 0.0.0",
33433343
"dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
33443344
"fortanix-sgx-abi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3936,7 +3936,7 @@ name = "unwind"
39363936
version = "0.0.0"
39373937
dependencies = [
39383938
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
3939-
"compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
3939+
"compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
39403940
"core 0.0.0",
39413941
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
39423942
]
@@ -4149,7 +4149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
41494149
"checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
41504150
"checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
41514151
"checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
4152-
"checksum compiler_builtins 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "e899b947d7e71c3d35c0b6194d64025b84946640510e215090c815b20828964e"
4152+
"checksum compiler_builtins 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "e79ed19793c99771b386d76e08c3419409bb3d418b81a8b8afc73524247461cf"
41534153
"checksum compiletest_rs 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "f40ecc9332b68270998995c00f8051ee856121764a0d3230e64c9efd059d27b6"
41544154
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
41554155
"checksum core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e2640d6d0bf22e82bed1b73c6aef8d5dd31e5abe6666c57e6d45e2649f4f887"

‎src/libcore/intrinsics.rs‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,6 +1051,19 @@ extern "rust-intrinsic" {
10511051
/// Returns the absolute value of an `f64`.
10521052
pub fn fabsf64(x: f64) -> f64;
10531053

1054+
/// Returns the minimum of two `f32` values.
1055+
#[cfg(not(bootstrap))]
1056+
pub fn minnumf32(x: f32, y: f32) -> f32;
1057+
/// Returns the minimum of two `f64` values.
1058+
#[cfg(not(bootstrap))]
1059+
pub fn minnumf64(x: f64, y: f64) -> f64;
1060+
/// Returns the maximum of two `f32` values.
1061+
#[cfg(not(bootstrap))]
1062+
pub fn maxnumf32(x: f32, y: f32) -> f32;
1063+
/// Returns the maximum of two `f64` values.
1064+
#[cfg(not(bootstrap))]
1065+
pub fn maxnumf64(x: f64, y: f64) -> f64;
1066+
10541067
/// Copies the sign from `y` to `x` for `f32` values.
10551068
pub fn copysignf32(x: f32, y: f32) -> f32;
10561069
/// Copies the sign from `y` to `x` for `f64` values.
@@ -1561,3 +1574,47 @@ pub unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
15611574
pub unsafe fn write_bytes<T>(dst: *mut T, val: u8, count: usize) {
15621575
real_intrinsics::write_bytes(dst, val, count)
15631576
}
1577+
1578+
// Simple bootstrap implementations of minnum/maxnum for stage0 compilation.
1579+
1580+
/// Returns the minimum of two `f32` values.
1581+
#[cfg(bootstrap)]
1582+
pub fn minnumf32(x: f32, y: f32) -> f32 {
1583+
// IEEE754 says: minNum(x, y) is the canonicalized number x if x < y, y if y < x, the
1584+
// canonicalized number if one operand is a number and the other a quiet NaN. Otherwise it
1585+
// is either x or y, canonicalized (this means results might differ among implementations).
1586+
// When either x or y is a signaling NaN, then the result is according to 6.2.
1587+
//
1588+
// Since we do not support sNaN in Rust yet, we do not need to handle them.
1589+
// FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by
1590+
// multiplying by 1.0. Should switch to the `canonicalize` when it works.
1591+
(if x < y || y != y { x } else { y }) * 1.0
1592+
}
1593+
1594+
/// Returns the minimum of two `f64` values.
1595+
#[cfg(bootstrap)]
1596+
pub fn minnumf64(x: f64, y: f64) -> f64 {
1597+
// Identical to the `f32` case.
1598+
(if x < y || y != y { x } else { y }) * 1.0
1599+
}
1600+
1601+
/// Returns the maximum of two `f32` values.
1602+
#[cfg(bootstrap)]
1603+
pub fn maxnumf32(x: f32, y: f32) -> f32 {
1604+
// IEEE754 says: maxNum(x, y) is the canonicalized number y if x < y, x if y < x, the
1605+
// canonicalized number if one operand is a number and the other a quiet NaN. Otherwise it
1606+
// is either x or y, canonicalized (this means results might differ among implementations).
1607+
// When either x or y is a signaling NaN, then the result is according to 6.2.
1608+
//
1609+
// Since we do not support sNaN in Rust yet, we do not need to handle them.
1610+
// FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by
1611+
// multiplying by 1.0. Should switch to the `canonicalize` when it works.
1612+
(if x < y || x != x { y } else { x }) * 1.0
1613+
}
1614+
1615+
/// Returns the maximum of two `f64` values.
1616+
#[cfg(bootstrap)]
1617+
pub fn maxnumf64(x: f64, y: f64) -> f64 {
1618+
// Identical to the `f32` case.
1619+
(if x < y || x != x { y } else { x }) * 1.0
1620+
}

‎src/libcore/num/f32.rs‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
88
#![stable(feature = "rust1", since = "1.0.0")]
99

10+
#[cfg(not(test))]
11+
use crate::intrinsics;
12+
1013
use crate::mem;
1114
use crate::num::FpCategory;
1215

@@ -372,15 +375,7 @@ impl f32 {
372375
#[stable(feature = "rust1", since = "1.0.0")]
373376
#[inline]
374377
pub fn max(self, other: f32) -> f32 {
375-
// IEEE754 says: maxNum(x, y) is the canonicalized number y if x < y, x if y < x, the
376-
// canonicalized number if one operand is a number and the other a quiet NaN. Otherwise it
377-
// is either x or y, canonicalized (this means results might differ among implementations).
378-
// When either x or y is a signalingNaN, then the result is according to 6.2.
379-
//
380-
// Since we do not support sNaN in Rust yet, we do not need to handle them.
381-
// FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by
382-
// multiplying by 1.0. Should switch to the `canonicalize` when it works.
383-
(if self.is_nan() || self < other { other } else { self }) * 1.0
378+
intrinsics::maxnumf32(self, other)
384379
}
385380

386381
/// Returns the minimum of the two numbers.
@@ -396,15 +391,7 @@ impl f32 {
396391
#[stable(feature = "rust1", since = "1.0.0")]
397392
#[inline]
398393
pub fn min(self, other: f32) -> f32 {
399-
// IEEE754 says: minNum(x, y) is the canonicalized number x if x < y, y if y < x, the
400-
// canonicalized number if one operand is a number and the other a quiet NaN. Otherwise it
401-
// is either x or y, canonicalized (this means results might differ among implementations).
402-
// When either x or y is a signalingNaN, then the result is according to 6.2.
403-
//
404-
// Since we do not support sNaN in Rust yet, we do not need to handle them.
405-
// FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by
406-
// multiplying by 1.0. Should switch to the `canonicalize` when it works.
407-
(if other.is_nan() || self < other { self } else { other }) * 1.0
394+
intrinsics::minnumf32(self, other)
408395
}
409396

410397
/// Raw transmutation to `u32`.

‎src/libcore/num/f64.rs‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
88
#![stable(feature = "rust1", since = "1.0.0")]
99

10+
#[cfg(not(test))]
11+
use crate::intrinsics;
12+
1013
use crate::mem;
1114
use crate::num::FpCategory;
1215

@@ -385,15 +388,7 @@ impl f64 {
385388
#[stable(feature = "rust1", since = "1.0.0")]
386389
#[inline]
387390
pub fn max(self, other: f64) -> f64 {
388-
// IEEE754 says: maxNum(x, y) is the canonicalized number y if x < y, x if y < x, the
389-
// canonicalized number if one operand is a number and the other a quiet NaN. Otherwise it
390-
// is either x or y, canonicalized (this means results might differ among implementations).
391-
// When either x or y is a signalingNaN, then the result is according to 6.2.
392-
//
393-
// Since we do not support sNaN in Rust yet, we do not need to handle them.
394-
// FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by
395-
// multiplying by 1.0. Should switch to the `canonicalize` when it works.
396-
(if self.is_nan() || self < other { other } else { self }) * 1.0
391+
intrinsics::maxnumf64(self, other)
397392
}
398393

399394
/// Returns the minimum of the two numbers.
@@ -409,15 +404,7 @@ impl f64 {
409404
#[stable(feature = "rust1", since = "1.0.0")]
410405
#[inline]
411406
pub fn min(self, other: f64) -> f64 {
412-
// IEEE754 says: minNum(x, y) is the canonicalized number x if x < y, y if y < x, the
413-
// canonicalized number if one operand is a number and the other a quiet NaN. Otherwise it
414-
// is either x or y, canonicalized (this means results might differ among implementations).
415-
// When either x or y is a signalingNaN, then the result is according to 6.2.
416-
//
417-
// Since we do not support sNaN in Rust yet, we do not need to handle them.
418-
// FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by
419-
// multiplying by 1.0. Should switch to the `canonicalize` when it works.
420-
(if other.is_nan() || self < other { self } else { other }) * 1.0
407+
intrinsics::minnumf64(self, other)
421408
}
422409

423410
/// Raw transmutation to `u64`.

‎src/librustc_codegen_llvm/context.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,11 @@ impl CodegenCx<'b, 'tcx> {
645645
ifn!("llvm.fabs.v4f64", fn(t_v4f64) -> t_v4f64);
646646
ifn!("llvm.fabs.v8f64", fn(t_v8f64) -> t_v8f64);
647647

648+
ifn!("llvm.minnum.f32", fn(t_f32, t_f32) -> t_f32);
649+
ifn!("llvm.minnum.f64", fn(t_f64, t_f64) -> t_f64);
650+
ifn!("llvm.maxnum.f32", fn(t_f32, t_f32) -> t_f32);
651+
ifn!("llvm.maxnum.f64", fn(t_f64, t_f64) -> t_f64);
652+
648653
ifn!("llvm.floor.f32", fn(t_f32) -> t_f32);
649654
ifn!("llvm.floor.v2f32", fn(t_v2f32) -> t_v2f32);
650655
ifn!("llvm.floor.v4f32", fn(t_v4f32) -> t_v4f32);

‎src/librustc_codegen_llvm/intrinsic.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ fn get_simple_intrinsic(cx: &CodegenCx<'ll, '_>, name: &str) -> Option<&'ll Valu
5555
"fmaf64" => "llvm.fma.f64",
5656
"fabsf32" => "llvm.fabs.f32",
5757
"fabsf64" => "llvm.fabs.f64",
58+
"minnumf32" => "llvm.minnum.f32",
59+
"minnumf64" => "llvm.minnum.f64",
60+
"maxnumf32" => "llvm.maxnum.f32",
61+
"maxnumf64" => "llvm.maxnum.f64",
5862
"copysignf32" => "llvm.copysign.f32",
5963
"copysignf64" => "llvm.copysign.f64",
6064
"floorf32" => "llvm.floor.f32",

‎src/librustc_typeck/check/intrinsic.rs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ pub fn intrisic_operation_unsafety(intrinsic: &str) -> hir::Unsafety {
7070
"overflowing_add" | "overflowing_sub" | "overflowing_mul" |
7171
"saturating_add" | "saturating_sub" |
7272
"rotate_left" | "rotate_right" |
73-
"ctpop" | "ctlz" | "cttz" | "bswap" | "bitreverse"
73+
"ctpop" | "ctlz" | "cttz" | "bswap" | "bitreverse" |
74+
"minnumf32" | "minnumf64" | "maxnumf32" | "maxnumf64"
7475
=> hir::Unsafety::Normal,
7576
_ => hir::Unsafety::Unsafe,
7677
}
@@ -272,6 +273,10 @@ pub fn check_intrinsic_type<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
272273
}
273274
"fabsf32" => (0, vec![ tcx.types.f32 ], tcx.types.f32),
274275
"fabsf64" => (0, vec![ tcx.types.f64 ], tcx.types.f64),
276+
"minnumf32" => (0, vec![ tcx.types.f32, tcx.types.f32 ], tcx.types.f32),
277+
"minnumf64" => (0, vec![ tcx.types.f64, tcx.types.f64 ], tcx.types.f64),
278+
"maxnumf32" => (0, vec![ tcx.types.f32, tcx.types.f32 ], tcx.types.f32),
279+
"maxnumf64" => (0, vec![ tcx.types.f64, tcx.types.f64 ], tcx.types.f64),
275280
"copysignf32" => (0, vec![ tcx.types.f32, tcx.types.f32 ], tcx.types.f32),
276281
"copysignf64" => (0, vec![ tcx.types.f64, tcx.types.f64 ], tcx.types.f64),
277282
"floorf32" => (0, vec![ tcx.types.f32 ], tcx.types.f32),

‎src/libstd/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ panic_unwind = { path = "../libpanic_unwind", optional = true }
1919
panic_abort = { path = "../libpanic_abort" }
2020
core = { path = "../libcore" }
2121
libc = { version = "0.2.51", default-features = false, features = ['rustc-dep-of-std'] }
22-
compiler_builtins = { version = "0.1.15" }
22+
compiler_builtins = { version = "0.1.16" }
2323
profiler_builtins = { path = "../libprofiler_builtins", optional = true }
2424
unwind = { path = "../libunwind" }
2525
hashbrown = { version = "0.4.0", features = ['rustc-dep-of-std'] }

0 commit comments

Comments
 (0)