promote

Author: hhugo

compiler/lib/generate.ml

@@ -1028,6 +1028,11 @@ let throw_statement ctx cx k loc =
         , loc )
       ]
 
+let is_int = function
+  | J.ENum n -> J.Num.is_int n
+  | J.EBin ((J.Bor | J.Lsr), _, _) -> true
+  | _ -> false
+
 let rec translate_expr ctx queue loc x e level : _ * J.statement_list =
   match e with
   | Apply { f; args; exact } ->
@@ -1322,23 +1327,31 @@ let rec translate_expr ctx queue loc x e level : _ * J.statement_list =
         | Eq, [ x; y ] ->
             let (px, cx), queue = access_queue' ~ctx queue x in
             let (py, cy), queue = access_queue' ~ctx queue y in
-            ( bool
-                (J.call
-                   (J.dot (s_var "Object") (Utf8_string.of_string_exn "is"))
-                   [ cx; cy ]
-                   loc)
-            , or_p px py
-            , queue )
+            let e =
+              if is_int cx || is_int cy
+              then bool (J.EBin (J.EqEqEq, cx, cy))
+              else
+                bool
+                  (J.call
+                     (J.dot (s_var "Object") (Utf8_string.of_string_exn "is"))
+                     [ cx; cy ]
+                     loc)
+            in
+            e, or_p px py, queue
         | Neq, [ x; y ] ->
             let (px, cx), queue = access_queue' ~ctx queue x in
             let (py, cy), queue = access_queue' ~ctx queue y in
-            ( bool_not
-                (J.call
-                   (J.dot (s_var "Object") (Utf8_string.of_string_exn "is"))
-                   [ cx; cy ]
-                   loc)
-            , or_p px py
-            , queue )
+            let e =
+              if is_int cx || is_int cy
+              then bool (J.EBin (J.NotEqEq, cx, cy))
+              else
+                bool_not
+                  (J.call
+                     (J.dot (s_var "Object") (Utf8_string.of_string_exn "is"))
+                     [ cx; cy ]
+                     loc)
+            in
+            e, or_p px py, queue
         | IsInt, [ x ] ->
             let (px, cx), queue = access_queue' ~ctx queue x in
             bool (Mlvalue.is_immediate cx), px, queue

compiler/lib/javascript.ml

@@ -42,6 +42,8 @@ module Num : sig
 
   val is_neg : t -> bool
 
+  val is_int : t -> bool
+
   (** Arithmetic *)
 
   val add : t -> t -> t
@@ -133,6 +135,13 @@ end = struct
 
   let is_neg s = Char.equal s.[0] '-'
 
+  let is_int = function
+    | "-0" -> false
+    | s ->
+        String.for_all s ~f:(function
+            | '0' .. '9' | '-' | '+' -> true
+            | _ -> false)
+
   let neg s =
     match String.drop_prefix s ~prefix:"-" with
     | None -> "-" ^ s

compiler/lib/javascript.mli

@@ -43,6 +43,8 @@ module Num : sig
 
   val is_neg : t -> bool
 
+  val is_int : t -> bool
+
   (** Arithmetic *)
 
   val add : t -> t -> t

compiler/tests-compiler/effects.ml

@@ -49,7 +49,7 @@ let fff () =
               10,
               [0,
                function(e, cont){
-                return e === E
+                return Object.is(e, E)
                         ? cont([0, function(k, cont){return cont(11);}])
                         : cont(0);
                }],

compiler/tests-compiler/effects_continuations.ml

@@ -106,7 +106,7 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
      try{var _t_ = runtime.caml_int_of_string(s), n = _t_;}
      catch(_x_){
       var _p_ = caml_wrap_exception(_x_);
-      if(_p_[1] !== Stdlib[7]){
+      if(! Object.is(_p_[1], Stdlib[7])){
        var raise$1 = caml_pop_trap();
        return raise$1(caml_maybe_attach_backtrace(_p_, 0));
       }
@@ -119,15 +119,15 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
      }
      catch(_w_){
       var _q_ = caml_wrap_exception(_w_);
-      if(_q_ !== Stdlib[8]){
+      if(! Object.is(_q_, Stdlib[8])){
        var raise$0 = caml_pop_trap();
        return raise$0(caml_maybe_attach_backtrace(_q_, 0));
       }
       var m = 0;
      }
      runtime.caml_push_trap
       (function(_v_){
-        if(_v_ === Stdlib[8]) return cont(0);
+        if(Object.is(_v_, Stdlib[8])) return cont(0);
         var raise = caml_pop_trap();
         return raise(caml_maybe_attach_backtrace(_v_, 0));
        });

compiler/tests-compiler/effects_exceptions.ml

@@ -60,7 +60,7 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
      try{var _k_ = runtime.caml_int_of_string(s), n = _k_;}
      catch(_o_){
       var _g_ = caml_wrap_exception(_o_);
-      if(_g_[1] !== Stdlib[7]){
+      if(! Object.is(_g_[1], Stdlib[7])){
        var raise$1 = caml_pop_trap();
        return raise$1(caml_maybe_attach_backtrace(_g_, 0));
       }
@@ -73,15 +73,15 @@ let%expect_test "test-compiler/lib-effects/test1.ml" =
      }
      catch(_n_){
       var _h_ = caml_wrap_exception(_n_);
-      if(_h_ !== Stdlib[8]){
+      if(! Object.is(_h_, Stdlib[8])){
        var raise$0 = caml_pop_trap();
        return raise$0(caml_maybe_attach_backtrace(_h_, 0));
       }
       var m = 0;
      }
      caml_push_trap
       (function(_m_){
-        if(_m_ === Stdlib[8]) return cont(0);
+        if(Object.is(_m_, Stdlib[8])) return cont(0);
         var raise = caml_pop_trap();
         return raise(caml_maybe_attach_backtrace(_m_, 0));
        });

compiler/tests-compiler/gh1354.ml

@@ -66,7 +66,7 @@ with Exit ->
        try{0; _b_ = _a_ + 1 | 0; throw caml_maybe_attach_backtrace(Stdlib[3], 1);}
        catch(_e_){
         var _c_ = caml_wrap_exception(_e_);
-        if(_c_ !== Stdlib[3]) throw caml_maybe_attach_backtrace(_c_, 0);
+        if(! Object.is(_c_, Stdlib[3])) throw caml_maybe_attach_backtrace(_c_, 0);
         caml_call2(Stdlib_Printf[3], _d_, _b_ | 0);
         var Test = [0];
         runtime.caml_register_global(3, Test, "Test");
@@ -153,7 +153,7 @@ with Exit ->
        }
        catch(_j_){
         var _d_ = caml_wrap_exception(_j_);
-        if(_d_ !== Stdlib[3]) throw caml_maybe_attach_backtrace(_d_, 0);
+        if(! Object.is(_d_, Stdlib[3])) throw caml_maybe_attach_backtrace(_d_, 0);
         caml_call3(Stdlib_Printf[3], _e_, _c_ | 0, _b_);
         var Test = [0];
         runtime.caml_register_global(4, Test, "Test");
@@ -229,7 +229,7 @@ with Exit ->
        }
        catch(_h_){
         var _c_ = caml_wrap_exception(_h_);
-        if(_c_ !== Stdlib[3]) throw caml_maybe_attach_backtrace(_c_, 0);
+        if(! Object.is(_c_, Stdlib[3])) throw caml_maybe_attach_backtrace(_c_, 0);
         caml_call2(Stdlib_Printf[3], _d_, _b_);
         var Test = [0];
         runtime.caml_register_global(4, Test, "Test");

compiler/tests-compiler/gh747.ml

@@ -350,7 +350,7 @@ end
     125:         (Stdlib_Printf[1], outchan, _c_, str);
     126:       }
     127:        /*<<test.ml:69:6>>*/  /*<<test.ml:69:6>>*/ var _g_ = i + 1 | 0;
-    128:       if(_f_ === i) break;
+    128:       if(Object.is(_f_, i)) break;
     129:       i = _g_;
     130:      }
     131:     }

compiler/tests-compiler/global_deadcode.ml

@@ -69,9 +69,9 @@ let%expect_test "Eliminates unused functions from functor" =
      if(! t) return [0, 0, x, 0, 1];
      var r = t[3], v = t[2], l = t[1], c = caml_call2(Ord[1], x, v);
      if(0 === c) return t;
-     if(0 <= c){var rr = add(x, r); return r === rr ? t : bal(l, v, rr);}
+     if(0 <= c){var rr = add(x, r); return Object.is(r, rr) ? t : bal(l, v, rr);}
      var ll = add(x, l);
-     return l === ll ? t : bal(ll, v, r);
+     return Object.is(l, ll) ? t : bal(ll, v, r);
     }
     function singleton(x){return [0, 0, x, 0, 1];}
     function find(x, param){

compiler/tests-compiler/loops.ml

@@ -254,7 +254,7 @@ let f t x =
      try{var val$0 = caml_call2(Stdlib_Hashtbl[6], t, x);}
      catch(_f_){
       var _c_ = caml_wrap_exception(_f_);
-      if(_c_ === Stdlib[8]) return - 1;
+      if(Object.is(_c_, Stdlib[8])) return - 1;
       throw caml_maybe_attach_backtrace(_c_, 0);
      }
      if(val$0 && ! val$0[2]){
@@ -265,7 +265,8 @@ let f t x =
         try{var val = caml_call2(Stdlib_Hashtbl[6], t, x$0);}
         catch(_e_){
          var _a_ = caml_wrap_exception(_e_);
-         if(_a_ !== Stdlib[3]) throw caml_maybe_attach_backtrace(_a_, 0);
+         if(! Object.is(_a_, Stdlib[3]))
+          throw caml_maybe_attach_backtrace(_a_, 0);
          var _d_ = 0;
          break a;
         }
@@ -500,12 +501,12 @@ let add_substitute =
          var lim = caml_ml_string_length(s), k = k$2, stop = new_start;
          for(;;){
           if(lim <= stop) throw caml_maybe_attach_backtrace(Stdlib[8], 1);
-          if(caml_string_get(s, stop) === opening){
+          if(Object.is(caml_string_get(s, stop), opening)){
            var i = stop + 1 | 0, k$0 = k + 1 | 0;
            k = k$0;
            stop = i;
           }
-          else if(caml_string_get(s, stop) === closing){
+          else if(Object.is(caml_string_get(s, stop), closing)){
            if(0 === k) break;
            var i$0 = stop + 1 | 0, k$1 = k - 1 | 0;
            k = k$1;