fix float_minimum_maximum

neri · Jun 11, 2024 · 451802d · 451802d
1 parent 50cf318
commit 451802d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 40 deletions.
diff --git a/src/cg/intr.rs b/src/cg/intr.rs
@@ -963,30 +963,12 @@ impl WasmInterpreter<'_> {
                 }
                 WasmImInstruction::F32Min => {
                     Self::binary_op(code, &mut value_stack, |lhs, rhs| unsafe {
-                        lhs.map_f32(|lhs| {
-                            let rhs = rhs.get_f32();
-                            if lhs.is_nan() {
-                                lhs
-                            } else if rhs.is_nan() {
-                                rhs
-                            } else {
-                                lhs.min(rhs)
-                            }
-                        });
+                        lhs.map_f32(|lhs| lhs.minimum(rhs.get_f32()));
                     });
                 }
                 WasmImInstruction::F32Max => {
                     Self::binary_op(code, &mut value_stack, |lhs, rhs| unsafe {
-                        lhs.map_f32(|lhs| {
-                            let rhs = rhs.get_f32();
-                            if lhs.is_nan() {
-                                lhs
-                            } else if rhs.is_nan() {
-                                rhs
-                            } else {
-                                lhs.max(rhs)
-                            }
-                        });
+                        lhs.map_f32(|lhs| lhs.maximum(rhs.get_f32()));
                     });
                 }
                 WasmImInstruction::F32Copysign => {
@@ -1084,30 +1066,12 @@ impl WasmInterpreter<'_> {
                 }
                 WasmImInstruction::F64Min => {
                     Self::binary_op(code, &mut value_stack, |lhs, rhs| unsafe {
-                        lhs.map_f64(|lhs| {
-                            let rhs = rhs.get_f64();
-                            if lhs.is_nan() {
-                                lhs
-                            } else if rhs.is_nan() {
-                                rhs
-                            } else {
-                                lhs.min(rhs)
-                            }
-                        });
+                        lhs.map_f64(|lhs| lhs.minimum(rhs.get_f64()));
                     });
                 }
                 WasmImInstruction::F64Max => {
                     Self::binary_op(code, &mut value_stack, |lhs, rhs| unsafe {
-                        lhs.map_f64(|lhs| {
-                            let rhs = rhs.get_f64();
-                            if lhs.is_nan() {
-                                lhs
-                            } else if rhs.is_nan() {
-                                rhs
-                            } else {
-                                lhs.max(rhs)
-                            }
-                        });
+                        lhs.map_f64(|lhs| lhs.maximum(rhs.get_f64()));
                     });
                 }
                 WasmImInstruction::F64Copysign => {

diff --git a/src/lib.rs b/src/lib.rs
@@ -3,6 +3,7 @@
 #![cfg_attr(not(test), no_std)]
 #![deny(unsafe_op_in_unsafe_fn)]
 //
+#![feature(float_minimum_maximum)]
 #![feature(negative_impls)]
 #![feature(assert_matches)]
 //