Merge pull request #4943 from rescript-lang/reduce_caml_int32_compare

absorb caml_int32_compare into caml_int_compare

Author: bobzhang

jscomp/core/js_exp_make.ml

@@ -996,7 +996,7 @@ let rec int_comp (cmp : Lam_compat.comparison) ?comment  (e0 : t) (e1 : t) =
       expression_desc = 
         Var (Qualified 
                ({kind = Runtime}, 
-                Some ("caml_int_compare" | "caml_int32_compare"))); _}, 
+                Some ("caml_int_compare"))); _}, 
       [l;r], _), 
     Number (Int {i = 0l})
     -> int_comp cmp l r (* = 0 > 0 < 0 *)

jscomp/core/lam_dispatch_primitive.ml

@@ -59,7 +59,7 @@ let args_const_unbox_approx_int_two (args : J.expression list) =
 *)
 let translate loc (prim_name : string) 
     (args : J.expression list) : J.expression  =
-  let call m = 
+  let [@inline] call m = 
     E.runtime_call m prim_name args in 
   begin match prim_name with 
     |  "caml_add_float" -> 
@@ -347,9 +347,9 @@ let translate loc (prim_name : string)
       end
     | "caml_int_compare"
     | "caml_int32_compare"
-
+      -> E.runtime_call Js_runtime_modules.caml_primitive 
+        "caml_int_compare" args
     | "caml_float_compare"
-
     | "caml_string_compare" 
     -> 
       call Js_runtime_modules.caml_primitive

jscomp/runtime/caml_primitive.ml

@@ -31,7 +31,7 @@ let caml_bool_compare (x : bool) (y : bool): int =
   | true, false -> 1 
   | false, true -> -1
 
-let caml_int32_compare = caml_int_compare
+
 
 let caml_float_compare (x : float) (y : float ) =
   if x = y then 0

jscomp/runtime/caml_primitive.mli

@@ -38,7 +38,7 @@ val caml_bool_compare : bool -> bool -> int
 val caml_float_compare : float -> float -> int 
 
 val caml_string_compare : string -> string -> int 
-val caml_int32_compare : int -> int -> int
+
 
 
 val caml_bool_min : bool selector 

lib/4.06.1/unstable/js_compiler.ml

@@ -88926,7 +88926,7 @@ let rec int_comp (cmp : Lam_compat.comparison) ?comment  (e0 : t) (e1 : t) =
       expression_desc = 
         Var (Qualified 
                ({kind = Runtime}, 
-                Some ("caml_int_compare" | "caml_int32_compare"))); _}, 
+                Some ("caml_int_compare"))); _}, 
       [l;r], _), 
     Number (Int {i = 0l})
     -> int_comp cmp l r (* = 0 > 0 < 0 *)
@@ -109187,7 +109187,7 @@ let args_const_unbox_approx_int_two (args : J.expression list) =
 *)
 let translate loc (prim_name : string) 
     (args : J.expression list) : J.expression  =
-  let call m = 
+  let [@inline] call m = 
     E.runtime_call m prim_name args in 
   begin match prim_name with 
     |  "caml_add_float" -> 
@@ -109475,9 +109475,9 @@ let translate loc (prim_name : string)
       end
     | "caml_int_compare"
     | "caml_int32_compare"
-
+      -> E.runtime_call Js_runtime_modules.caml_primitive 
+        "caml_int_compare" args
     | "caml_float_compare"
-
     | "caml_string_compare" 
     -> 
       call Js_runtime_modules.caml_primitive

lib/4.06.1/whole_compiler.ml

@@ -378845,7 +378845,7 @@ let rec int_comp (cmp : Lam_compat.comparison) ?comment  (e0 : t) (e1 : t) =
       expression_desc = 
         Var (Qualified 
                ({kind = Runtime}, 
-                Some ("caml_int_compare" | "caml_int32_compare"))); _}, 
+                Some ("caml_int_compare"))); _}, 
       [l;r], _), 
     Number (Int {i = 0l})
     -> int_comp cmp l r (* = 0 > 0 < 0 *)
@@ -391593,7 +391593,7 @@ let args_const_unbox_approx_int_two (args : J.expression list) =
 *)
 let translate loc (prim_name : string) 
     (args : J.expression list) : J.expression  =
-  let call m = 
+  let [@inline] call m = 
     E.runtime_call m prim_name args in 
   begin match prim_name with 
     |  "caml_add_float" -> 
@@ -391881,9 +391881,9 @@ let translate loc (prim_name : string)
       end
     | "caml_int_compare"
     | "caml_int32_compare"
-
+      -> E.runtime_call Js_runtime_modules.caml_primitive 
+        "caml_int_compare" args
     | "caml_float_compare"
-
     | "caml_string_compare" 
     -> 
       call Js_runtime_modules.caml_primitive

lib/es6/caml_primitive.mjs

@@ -129,14 +129,11 @@ function caml_int32_max(x, y) {
   }
 }
 
-var caml_int32_compare = caml_int_compare;
-
 export {
   caml_int_compare ,
   caml_bool_compare ,
   caml_float_compare ,
   caml_string_compare ,
-  caml_int32_compare ,
   caml_bool_min ,
   caml_int_min ,
   caml_float_min ,

lib/es6/int32.mjs

@@ -41,7 +41,7 @@ function of_string_opt(s) {
   }
 }
 
-var compare = Caml_primitive.caml_int32_compare;
+var compare = Caml_primitive.caml_int_compare;
 
 function equal(x, y) {
   return x === y;

lib/js/caml_primitive.js

@@ -129,13 +129,10 @@ function caml_int32_max(x, y) {
   }
 }
 
-var caml_int32_compare = caml_int_compare;
-
 exports.caml_int_compare = caml_int_compare;
 exports.caml_bool_compare = caml_bool_compare;
 exports.caml_float_compare = caml_float_compare;
 exports.caml_string_compare = caml_string_compare;
-exports.caml_int32_compare = caml_int32_compare;
 exports.caml_bool_min = caml_bool_min;
 exports.caml_int_min = caml_int_min;
 exports.caml_float_min = caml_float_min;

lib/js/int32.js

@@ -41,7 +41,7 @@ function of_string_opt(s) {
   }
 }
 
-var compare = Caml_primitive.caml_int32_compare;
+var compare = Caml_primitive.caml_int_compare;
 
 function equal(x, y) {
   return x === y;