remove Caml int32/int64/nativeint

Author: cometkim

jscomp/core/js_exp_make.ml

@@ -900,22 +900,6 @@ let rec int32_bor ?comment (e1 : J.expression) (e2 : J.expression) :
       int32_bor e1 e2
   | _ -> { comment; expression_desc = Bin (Bor, e1, e2) }
 
-(* Arithmatic operations
-   TODO: distinguish between int and float
-   TODO: Note that we have to use Int64 to avoid integer overflow, this is fine
-   since Js only have .
-
-   like code below
-   {[
-     MAX_INT_VALUE - (MAX_INT_VALUE - 100) + 20
-   ]}
-
-   {[
-     MAX_INT_VALUE - x + 30
-   ]}
-
-   check: Re-association: avoid integer overflow
-*)
 let to_int32 ?comment (e : J.expression) : J.expression =
   int32_bor ?comment e zero_int_literal
 (* TODO: if we already know the input is int32, [x|0] can be reduced into [x] *)
@@ -1180,15 +1164,15 @@ let int32_div ~checked ?comment (e1 : t) (e2 : t) : t =
       | Number (Int { i = i0 }) -> int (Int32.div i0 i1)
       | _ -> to_int32 (float_div ?comment e1 e2))
   | _, _ ->
-      if checked then runtime_call Js_runtime_modules.int32 "div" [ e1; e2 ]
+      if checked then runtime_call Js_runtime_modules.int "div" [ e1; e2 ]
       else to_int32 (float_div ?comment e1 e2)
 
 let int32_mod ~checked ?comment e1 (e2 : t) : J.expression =
   match e2.expression_desc with
   | Number (Int { i }) when i <> 0l ->
       { comment; expression_desc = Bin (Mod, e1, e2) }
   | _ ->
-      if checked then runtime_call Js_runtime_modules.int32 "mod_" [ e1; e2 ]
+      if checked then runtime_call Js_runtime_modules.int "mod_" [ e1; e2 ]
       else { comment; expression_desc = Bin (Mod, e1, e2) }
 
 let float_mul ?comment e1 e2 = bin ?comment Mul e1 e2

jscomp/core/js_long.ml

@@ -461,16 +461,6 @@ module Lift = struct
 
   let bool b = if b then true_ else false_
 
-  (* ATTENTION: [float, nativeint] constant propogaton is not done
-     yet , due to cross platform problem
-  *)
-  (* let float b  : t =
-     Lconst ((Const_float b)) *)
-
-  (* let nativeint b : t =
-     Lconst ((Const_nativeint b)) *)
-
-  let int64 b : t = Lconst (Const_int64 b)
   let string s : t = Lconst (Const_string { s; unicode = false })
   let char b : t = Lconst (Const_char b)
 end
@@ -492,14 +482,11 @@ let prim ~primitive:(prim : Lam_primitive.t) ~args loc : t =
       (* | Pnegbint Pnativeint, ( (Const_nativeint i)) *)
       (*   ->   *)
       (*   Lift.nativeint (Nativeint.neg i) *)
-      | Pnegint64, Const_int64 a -> Lift.int64 (Int64.neg a)
       | Pnot, Const_js_true -> false_
       | Pnot, Const_js_false -> true_
       | _ -> default ())
   | [ Lconst a; Lconst b ] -> (
       match (prim, a, b) with
-      | Pint64comp cmp, Const_int64 a, Const_int64 b ->
-          Lift.bool (Lam_compat.cmp_int64 cmp a b)
       | Pintcomp cmp, Const_int a, Const_int b ->
           Lift.bool (Lam_compat.cmp_int32 cmp a.i b.i)
       | Pfloatcomp cmp, Const_float a, Const_float b ->
@@ -532,28 +519,6 @@ let prim ~primitive:(prim : Lam_primitive.t) ~args loc : t =
           | Plsrint -> int_ (Int32.shift_right_logical aa (Int32.to_int bb))
           | Pasrint -> int_ (Int32.shift_right aa (Int32.to_int bb))
           | _ -> default ())
-      | ( ( Paddint64 | Psubint64 | Pmulint64 | Pdivint64 | Pmodint64
-          | Pandint64 | Porint64 | Pxorint64 ),
-          Const_int64 aa,
-          Const_int64 bb ) -> (
-          match prim with
-          | Paddint64 -> Lift.int64 (Int64.add aa bb)
-          | Psubint64 -> Lift.int64 (Int64.sub aa bb)
-          | Pmulint64 -> Lift.int64 (Int64.mul aa bb)
-          | Pdivint64 -> (
-              try Lift.int64 (Int64.div aa bb) with _ -> default ())
-          | Pmodint64 -> (
-              try Lift.int64 (Int64.rem aa bb) with _ -> default ())
-          | Pandint64 -> Lift.int64 (Int64.logand aa bb)
-          | Porint64 -> Lift.int64 (Int64.logor aa bb)
-          | Pxorint64 -> Lift.int64 (Int64.logxor aa bb)
-          | _ -> default ())
-      | Plslint64, Const_int64 aa, Const_int { i = b } ->
-          Lift.int64 (Int64.shift_left aa (Int32.to_int b))
-      | Plsrint64, Const_int64 aa, Const_int { i = b } ->
-          Lift.int64 (Int64.shift_right_logical aa (Int32.to_int b))
-      | Pasrint64, Const_int64 aa, Const_int { i = b } ->
-          Lift.int64 (Int64.shift_right aa (Int32.to_int b))
       | Psequand, Const_js_false, (Const_js_true | Const_js_false) -> false_
       | Psequand, Const_js_true, Const_js_true -> true_
       | Psequand, Const_js_true, Const_js_false -> false_
@@ -639,7 +604,6 @@ let rec eval_const_as_bool (v : Lam_constant.t) : bool =
   match v with
   | Const_int { i = x } -> x <> 0l
   | Const_char x -> x <> 0
-  | Const_int64 x -> x <> 0L
   | Const_js_false | Const_js_null | Const_module_alias | Const_js_undefined _ ->
       false
   | Const_js_true | Const_string _ | Const_pointer _ | Const_float _ | Const_bigint _