small refactoring

Author: hhugo

compiler/lib-wasm/gc_target.ml

@@ -540,7 +540,7 @@ module Value = struct
 
   let ( >>| ) x f = map f x
 
-  let eq_gen ~negate x y =
+  let js_eqeqeq ~negate x y =
     let xv = Code.Var.fresh () in
     let yv = Code.Var.fresh () in
     let* js = Type.js_type in
@@ -565,21 +565,15 @@ module Value = struct
        return ())
       (if negate then Arith.eqz n else n)
 
-  let phys_eq ~relaxed x y =
-    if relaxed
-    then eq_gen ~negate:false x y
-    else
-      let* x = x in
-      let* y = y in
-      return (W.RefEq (x, y))
+  let phys_eq x y =
+    let* x = x in
+    let* y = y in
+    return (W.RefEq (x, y))
 
-  let phys_neq ~relaxed x y =
-    if relaxed
-    then eq_gen ~negate:true x y
-    else
-      let* x = x in
-      let* y = y in
-      Arith.eqz (return (W.RefEq (x, y)))
+  let phys_neq x y =
+    let* x = x in
+    let* y = y in
+    Arith.eqz (return (W.RefEq (x, y)))
 
   let ult = Arith.ult
 

compiler/lib-wasm/generate.ml

@@ -226,16 +226,18 @@ module Generate (Target : Target_sig.S) = struct
           Arith.(transl_prim_arg ctx ~typ:(Int Unnormalized) x lsl const 1l)
           Arith.(transl_prim_arg ctx ~typ:(Int Unnormalized) y lsl const 1l)
     | Top, Top ->
+        Value.js_eqeqeq
+          ~negate
+          (transl_prim_arg ctx ~typ:Top x)
+          (transl_prim_arg ctx ~typ:Top y)
+    | Bot, _ | _, Bot ->
+        (* this is deadcode, deadcode is off *)
         (if negate then Value.phys_neq else Value.phys_eq)
-          ~relaxed:true
           (transl_prim_arg ctx ~typ:Top x)
           (transl_prim_arg ctx ~typ:Top y)
-    | Int (Normalized | Unnormalized), (Int Ref | Top | Bot | Number _ | Tuple _)
-    | (Int Ref | Top | Bot | Number _ | Tuple _), Int (Normalized | Unnormalized)
-    | ( (Int Ref | Top | Bot | Number _ | Tuple _)
-      , (Int Ref | Top | Bot | Number _ | Tuple _) ) ->
+    | (Int _ | Number _ | Tuple _), _ | _, (Int _ | Number _ | Tuple _) ->
+        (* Only Top may contain JavaScript values *)
         (if negate then Value.phys_neq else Value.phys_eq)
-          ~relaxed:false
           (transl_prim_arg ctx ~typ:Top x)
           (transl_prim_arg ctx ~typ:Top y)
 

compiler/lib-wasm/target_sig.ml

@@ -124,11 +124,11 @@ module type S = sig
 
     val le : expression -> expression -> expression
 
-    (* Relaxed means using JavaScript strict equality to compare
-       JavaScript values *)
-    val phys_eq : relaxed:bool -> expression -> expression -> expression
+    val js_eqeqeq : negate:bool -> expression -> expression -> expression
 
-    val phys_neq : relaxed:bool -> expression -> expression -> expression
+    val phys_eq : expression -> expression -> expression
+
+    val phys_neq : expression -> expression -> expression
 
     val ult : expression -> expression -> expression