diff options
| author | Oli Scherer <github35764891676564198441@oli-obk.de> | 2021-03-11 14:56:03 +0000 |
|---|---|---|
| committer | Oli Scherer <github35764891676564198441@oli-obk.de> | 2021-03-11 14:56:03 +0000 |
| commit | c69b108d2ab3c2b99b784590be34efcf89ec789a (patch) | |
| tree | 057973f060b9819e7926e5ee8005292e27670fa3 | |
| parent | ea16128233c6bc7ab6ad8e6c68860f778ba33ad9 (diff) | |
| download | rust-c69b108d2ab3c2b99b784590be34efcf89ec789a.tar.gz rust-c69b108d2ab3c2b99b784590be34efcf89ec789a.zip | |
Reintroduce accidentally deleted assertions.
These were removed in https://github.com/rust-lang/rust/pull/50198
| -rw-r--r-- | compiler/rustc_mir_build/src/thir/constant.rs | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/compiler/rustc_mir_build/src/thir/constant.rs b/compiler/rustc_mir_build/src/thir/constant.rs index 969f7d1e3a4..ac93d042970 100644 --- a/compiler/rustc_mir_build/src/thir/constant.rs +++ b/compiler/rustc_mir_build/src/thir/constant.rs @@ -1,3 +1,4 @@ +use rustc_apfloat::Float; use rustc_ast as ast; use rustc_middle::mir::interpret::{ Allocation, ConstValue, LitToConstError, LitToConstInput, Scalar, @@ -61,20 +62,40 @@ fn parse_float<'tcx>(num: Symbol, fty: ty::FloatTy, neg: bool) -> Result<ConstVa use rustc_apfloat::ieee::{Double, Single}; let scalar = match fty { ty::FloatTy::F32 => { - num.parse::<f32>().map_err(|_| ())?; + let rust_f = num.parse::<f32>().map_err(|_| ())?; let mut f = num.parse::<Single>().unwrap_or_else(|e| { panic!("apfloat::ieee::Single failed to parse `{}`: {:?}", num, e) }); + assert!( + u128::from(rust_f.to_bits()) == f.to_bits(), + "apfloat::ieee::Single gave different result for `{}`: \ + {}({:#x}) vs Rust's {}({:#x})", + rust_f, + f, + f.to_bits(), + Single::from_bits(rust_f.to_bits().into()), + rust_f.to_bits() + ); if neg { f = -f; } Scalar::from_f32(f) } ty::FloatTy::F64 => { - num.parse::<f64>().map_err(|_| ())?; + let rust_f = num.parse::<f64>().map_err(|_| ())?; let mut f = num.parse::<Double>().unwrap_or_else(|e| { panic!("apfloat::ieee::Double failed to parse `{}`: {:?}", num, e) }); + assert!( + u128::from(rust_f.to_bits()) == f.to_bits(), + "apfloat::ieee::Double gave different result for `{}`: \ + {}({:#x}) vs Rust's {}({:#x})", + rust_f, + f, + f.to_bits(), + Double::from_bits(rust_f.to_bits().into()), + rust_f.to_bits() + ); if neg { f = -f; } |
