util/libm: replace force_eval! by std::hint::black_box

During an internal review of unsafe code at work, @cramertj noticed that the the `force_eval!` can be replaced by `std::hint::black_box`, removing the need for unsafe Rust.
BurntSushi · Aug 27, 2024 · c2bf48b · c2bf48b
1 parent b4c9bce
commit c2bf48b
Showing 1 changed file with 8 additions and 28 deletions.
diff --git a/src/util/libm.rs b/src/util/libm.rs
@@ -24,12 +24,6 @@ pub(crate) trait Float {
     fn fract(self) -> Self;
 }
 
-macro_rules! force_eval {
-    ($e:expr) => {
-        core::ptr::read_volatile(&$e)
-    };
-}
-
 const TOINT64: f64 = 1. / f64::EPSILON;
 
 impl Float for f64 {
@@ -58,9 +52,7 @@ impl Float for f64 {
         };
         // special case because of non-nearest rounding modes
         if e < 0x3ff {
-            unsafe {
-                force_eval!(y);
-            }
+            std::hint::black_box(y);
             return if (u >> 63) != 0 { -0. } else { 1. };
         }
         if y < 0. {
@@ -86,9 +78,7 @@ impl Float for f64 {
         };
         /* special case because of non-nearest rounding modes */
         if e < 0x3ff {
-            unsafe {
-                force_eval!(y);
-            }
+            std::hint::black_box(y);
             return if (ui >> 63) != 0 { -1. } else { 0. };
         }
         if y > 0. {
@@ -129,7 +119,7 @@ impl Float for f64 {
             return x;
         }
         unsafe {
-            force_eval!(x + x1p120);
+            std::hint::black_box(x + x1p120);
         }
         i &= !m;
         f64::from_bits(i)
@@ -162,17 +152,13 @@ impl Float for f32 {
             if (ui & m) == 0 {
                 return x;
             }
-            unsafe {
-                force_eval!(x + f32::from_bits(0x7b800000));
-            }
+            std::hint::black_box(x + f32::from_bits(0x7b800000));
             if ui >> 31 == 0 {
                 ui += m;
             }
             ui &= !m;
         } else {
-            unsafe {
-                force_eval!(x + f32::from_bits(0x7b800000));
-            }
+            std::hint::black_box(x + f32::from_bits(0x7b800000));
             if ui >> 31 != 0 {
                 return -0.0;
             } else if ui << 1 != 0 {
@@ -195,17 +181,13 @@ impl Float for f32 {
             if (ui & m) == 0 {
                 return x;
             }
-            unsafe {
-                force_eval!(x + f32::from_bits(0x7b800000));
-            }
+            std::hint::black_box(x + f32::from_bits(0x7b800000));
             if ui >> 31 != 0 {
                 ui += m;
             }
             ui &= !m;
         } else {
-            unsafe {
-                force_eval!(x + f32::from_bits(0x7b800000));
-            }
+            std::hint::black_box(x + f32::from_bits(0x7b800000));
             if ui >> 31 == 0 {
                 ui = 0;
             } else if ui << 1 != 0 {
@@ -245,9 +227,7 @@ impl Float for f32 {
         if (i & m) == 0 {
             return x;
         }
-        unsafe {
-            force_eval!(x + x1p120);
-        }
+        std::hint::black_box(x + x1p120);
         i &= !m;
         f32::from_bits(i)
     }