Merge pull request #4893 from rescript-lang/simplify_number

simplify numbers in JS IR

Author: bobzhang

jscomp/core/j.ml

@@ -73,7 +73,7 @@ and required_modules = module_id list
     currently we always use quote
  *)
 and property_name =  Js_op.property_name
-and jsint = Js_op.jsint
+and jsint = int32
 and ident = Ident.t 
 and module_id = {
   id : ident; kind : Js_op.kind

jscomp/core/js_analyzer.ml

@@ -178,9 +178,9 @@ let rec eq_expression
   begin match x0  with 
     | Null -> y0 = Null
     | Undefined -> y0 = Undefined
-    | Number (Int i) -> 
+    | Number (Int {i}) -> 
       begin match y0 with  
-        | Number (Int j)   -> i = j 
+        | Number (Int {i = j})   -> i = j 
         | _ -> false 
       end
     | Number (Float _) -> false

jscomp/core/js_dump.ml

@@ -671,7 +671,9 @@ and expression_desc cxt ~(level:int) f x : cxt  =
       | Float {f} ->
         Js_number.caml_float_literal_to_js_string f
       (* attach string here for float constant folding?*)
-      | Int { i; _}
+      | Int { i; c = Some c}
+        -> Format.asprintf "/* %C */%ld" c i
+      | Int { i; c = None}
         -> Int32.to_string i (* check , js convention with ocaml lexical convention *)
       | Uint i
         -> Format.asprintf "%lu" i

jscomp/core/js_exp_make.mli

@@ -247,7 +247,7 @@ val extension_assign :
 val assign_by_int : 
   ?comment:string -> 
   t -> 
-  Js_op.jsint -> 
+  int32 -> 
   t -> 
   t
 

jscomp/core/js_fold.ml

@@ -316,7 +316,7 @@ class virtual fold =
     method length_object : length_object -> 'self_type = o#unknown
     method label : label -> 'self_type = o#string
     method kind : kind -> 'self_type = o#unknown
-    method jsint : jsint -> 'self_type = o#unknown
+    method jsint : jsint -> 'self_type = o#int32
     method int_op : int_op -> 'self_type = o#unknown
     method ident_info : ident_info -> 'self_type = o#unknown
     method ident : ident -> 'self_type = o#unknown

jscomp/core/js_map.ml

@@ -338,7 +338,7 @@ class virtual map =
     method length_object : length_object -> length_object = o#unknown
     method label : label -> label = o#string
     method kind : kind -> kind = o#unknown
-    method jsint : jsint -> jsint = o#unknown
+    method jsint : jsint -> jsint = o#int32
     method int_op : int_op -> int_op = o#unknown
     method ident_info : ident_info -> ident_info = o#unknown
     method ident : ident -> ident = o#unknown

jscomp/core/js_of_lam_string.ml

@@ -40,7 +40,7 @@ module E = Js_exp_make
 *)
 
 let const_char (i : char) = 
-  E.int  ~comment:("\"" ^ String.escaped (String.make 1 i) ^ "\"") 
+  E.int  
     ~c:i (Int32.of_int @@ Char.code i)
 
 let caml_char_of_int  (v : J.expression)  =  v

jscomp/core/js_op.ml

@@ -153,22 +153,13 @@ type property_name =
 type 'a access = 
   | Getter
   | Setter
-type jsint = Int32.t
-
-type int_or_char = 
-    { i : jsint; 
-      (* we can not use [int] on 32 bit platform, if we dont use 
-          [Int32.t], we need a configuration step          
-      *)
-      c : char option
-    }
 
  (* literal char *)
 type float_lit = { f :  string } [@@unboxed]
 
 type number = 
   | Float of float_lit 
-  | Int of int_or_char
+  | Int of { i  : int32; c : char option}
   | Uint of int32
 
   (* becareful when constant folding +/-, 

jscomp/core/lam_analysis.ml

@@ -58,7 +58,14 @@ let rec no_side_effects (lam : Lam.t) : bool =
             | "caml_make_vect"
             | "caml_create_bytes"
             | "caml_obj_dup"
-            | "caml_array_dup"            
+            | "caml_array_dup" 
+
+            | "nativeint_add"         
+            | "nativeint_div"
+            | "nativeint_mod"
+            | "nativeint_lsr"  
+            | "nativeint_mul"
+
             ), _  -> true 
           | "caml_ml_open_descriptor_in", [Lconst (  (Const_int {i = 0l}))] -> true 
           | "caml_ml_open_descriptor_out", 

jscomp/core/lam_dispatch_primitive.ml

@@ -98,24 +98,21 @@ let translate loc (prim_name : string)
         | _ -> assert false 
       end
     | "caml_int32_of_int"
-    | "caml_nativeint_of_int" 
-    | "caml_nativeint_of_int32" -> 
+       -> 
       begin match args with 
         | [e] -> e 
         | _ -> assert false 
       end
     | "caml_int32_of_float"
     | "caml_int_of_float"
-    | "caml_nativeint_of_float" -> 
+       -> 
       begin match args with 
         | [e] -> E.to_int32 e 
         | _ -> assert false 
       end
     | "caml_int32_to_float"
-    | "caml_int32_to_int"
-    | "caml_nativeint_to_int" 
-    | "caml_nativeint_to_float"
-    | "caml_nativeint_to_int32" -> 
+    | "caml_int32_to_int"     
+      -> 
       begin match args with 
         | [e] -> e (* TODO: do more checking when [to_int32]*)
         | _ -> assert false 
@@ -290,11 +287,6 @@ let translate loc (prim_name : string)
     | "caml_int32_equal_null"
     | "caml_int32_equal_nullable"
     | "caml_int32_equal_undefined"
-    
-
-    | "caml_nativeint_equal_null"
-    | "caml_nativeint_equal_nullable"
-    | "caml_nativeint_equal_undefined"
       ->   
       begin match args with 
       | [e0;e1]
@@ -355,7 +347,7 @@ let translate loc (prim_name : string)
       end
     | "caml_int_compare"
     | "caml_int32_compare"
-    | "caml_nativeint_compare"
+
     | "caml_float_compare"
 
     | "caml_string_compare" 
@@ -365,7 +357,7 @@ let translate loc (prim_name : string)
     | "caml_int_min"
     | "caml_float_min"
     | "caml_string_min"
-    | "caml_nativeint_min"
+
     | "caml_int32_min"
 
       -> 
@@ -381,7 +373,7 @@ let translate loc (prim_name : string)
     | "caml_int_max"
     | "caml_float_max"
     | "caml_string_max"
-    | "caml_nativeint_max"
+
     | "caml_int32_max"    
     -> 
       begin match args with