Move one more case.

Author: cristianoc

jscomp/core/js_exp_make.mli

@@ -188,6 +188,8 @@ val assign : ?comment:string -> t -> t -> t
 
 val tag_type : Ast_untagged_variants.tag_type -> t
 
+val emit_check : t Ast_untagged_variants.DynamiChecks.t -> t
+
 val triple_equal : ?comment:string -> t -> t -> t
 (* TODO: reduce [triple_equal] use *)
 

jscomp/core/lam_compile.ml

@@ -750,22 +750,13 @@ and compile_string_cases ~cxt ~switch_exp ~default cases: initialization  =
     ~switch_exp
     ~default
 and compile_untagged_cases ~cxt ~switch_exp ~default cases =
-  let add_runtime_type_check (literal: Ast_untagged_variants.tag_type) x y = match literal with
-  | Untagged IntType
-  | Untagged StringType
-  | Untagged FloatType
-  | Untagged ObjectType -> E.string_equal (E.typeof y) x 
-  | Untagged ArrayType -> E.is_array y
-  | Untagged UnknownType ->
-    (* This should not happen because unknown must be the only non-literal case *)
-    assert false 
-  | Bool _ | Float _ | Int _ | String _ | Null | Undefined -> x in
   let mk_eq (i : Ast_untagged_variants.tag_type option) x j y = match i, j with
-    | Some literal, _ ->
-      add_runtime_type_check literal x y
-    | _, Some literal ->
-      add_runtime_type_check literal y x
-    | _ -> E.string_equal x y
+    | Some tag_type, _ ->
+      Ast_untagged_variants.DynamiChecks.add_runtime_type_check ~tag_type (Expr x) (Expr y) |> E.emit_check
+    | _, Some tag_type ->
+      Ast_untagged_variants.DynamiChecks.add_runtime_type_check ~tag_type (Expr y) (Expr x) |> E.emit_check
+    | _ ->
+      Ast_untagged_variants.DynamiChecks.(==) (Expr x) (Expr y) |> E.emit_check
   in
   let is_array (l, _) = l = Ast_untagged_variants.Untagged ArrayType in
   let switch ?default ?declaration e clauses =
@@ -780,7 +771,7 @@ and compile_untagged_cases ~cxt ~switch_exp ~default cases =
     | _ ->
       S.string_switch ?default ?declaration (E.typeof e) clauses in
   cases |> compile_general_cases
-    ~make_exp:E.tag_type
+    ~make_exp: E.tag_type
     ~eq_exp: mk_eq
     ~cxt
     ~switch

jscomp/ml/ast_untagged_variants.ml

@@ -327,4 +327,15 @@ module DynamiChecks = struct
       e == nil ||| typeof e != object_
     else (* (undefiled + other) || other *)
       typeof e != object_
+
+  let add_runtime_type_check ~tag_type x y = match tag_type with
+    | Untagged IntType
+    | Untagged StringType
+    | Untagged FloatType
+    | Untagged ObjectType -> typeof y == x 
+    | Untagged ArrayType -> is_array y
+    | Untagged UnknownType ->
+      (* This should not happen because unknown must be the only non-literal case *)
+      assert false 
+    | Bool _ | Float _ | Int _ | String _ | Null | Undefined -> x
 end