forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix issue rust-lang#50811 (
NaN > NaN
was true).
Fix rust-lang#50811 Make sure the float comparison output is consistent with the expected behavior when NaN is involved. ---- Note: This PR is a **BREAKING CHANGE**. If you have used `>` or `>=` to compare floats, and make the result as the length of a fixed array type, like: ```rust use std::f64::NAN; let x: [u8; (NAN > NAN) as usize] = [1]; ``` then the code will no longer compile. Previously, all float comparison involving NaN will just return "Greater", i.e. `NAN > NAN` would wrongly return `true` during const evaluation. If you need to retain the old behavior (why), you may replace `a > b` with `a != a || b != b || a > b`.
- Loading branch information
1 parent
0957c0f
commit 07c42af
Showing
2 changed files
with
71 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
#![feature(test)] | ||
|
||
extern crate test; | ||
|
||
use std::f64::{NAN, NEG_INFINITY, INFINITY, MAX}; | ||
use std::mem::size_of; | ||
use test::black_box; | ||
|
||
// Ensure the const-eval result and runtime result of float comparison are equivalent. | ||
|
||
macro_rules! compare { | ||
($op:tt) => { | ||
compare!( | ||
[NEG_INFINITY, -MAX, -1.0, -0.0, 0.0, 1.0, MAX, INFINITY, NAN], | ||
$op | ||
); | ||
}; | ||
([$($lhs:expr),+], $op:tt) => { | ||
$(compare!( | ||
$lhs, | ||
$op, | ||
[NEG_INFINITY, -MAX, -1.0, -0.0, 0.0, 1.0, MAX, INFINITY, NAN] | ||
);)+ | ||
}; | ||
($lhs:expr, $op:tt, [$($rhs:expr),+]) => { | ||
$({ | ||
// Wrap the check in its own function to reduce time needed to borrowck. | ||
fn check() { | ||
static CONST_EVAL: bool = $lhs $op $rhs; | ||
let runtime_eval = black_box($lhs) $op black_box($rhs); | ||
assert_eq!(CONST_EVAL, runtime_eval, stringify!($lhs $op $rhs)); | ||
assert_eq!( | ||
size_of::<[u8; ($lhs $op $rhs) as usize]>(), | ||
runtime_eval as usize, | ||
stringify!($lhs $op $rhs (forced const eval)) | ||
); | ||
} | ||
check(); | ||
})+ | ||
}; | ||
} | ||
|
||
fn main() { | ||
assert_eq!(0.0/0.0 < 0.0/0.0, false); | ||
assert_eq!(0.0/0.0 > 0.0/0.0, false); | ||
assert_eq!(NAN < NAN, false); | ||
assert_eq!(NAN > NAN, false); | ||
|
||
compare!(==); | ||
compare!(!=); | ||
compare!(<); | ||
compare!(<=); | ||
compare!(>); | ||
compare!(>=); | ||
} |