avoid nativeint for hash

downsides:
it is easy to mix functions with the same type but having different semantics.
e.g, `- i ` vs `caml_nativeint_extern.neg i `, the former outputs i32, while the latter could output an overflowed i32 as u32

Author: bobzhang

jscomp/runtime/caml_hash.ml

@@ -77,19 +77,18 @@ let unsafe_pop (q : 'a t) =
 
 
 
-external ( +~ ) : nativeint -> nativeint -> nativeint =
-   "%int32_add"
+let caml_hash_mix_int = Caml_hash_primitive.caml_hash_mix_int
+let caml_hash_final_mix = Caml_hash_primitive.caml_hash_final_mix
+let caml_hash_mix_string =  Caml_hash_primitive.caml_hash_mix_string
 
 
-open Caml_hash_primitive
-
-let caml_hash (count : int) _limit (seed : nativeint) 
-  (obj : Obj.t) : nativeint = 
+let caml_hash (count : int) _limit (seed : int) 
+  (obj : Obj.t) : int = 
   let hash = ref seed in 
   if Js.typeof obj = "number" then
     begin 
       let u = Caml_nativeint_extern.of_float (Obj.magic obj) in
-      hash.contents <- caml_hash_mix_int hash.contents (u +~ u +~ 1n) ;
+      hash.contents <- caml_hash_mix_int hash.contents (u + u + 1) ;
       caml_hash_final_mix hash.contents
     end
   else if Js.typeof obj = "string" then 
@@ -111,7 +110,7 @@ let caml_hash (count : int) _limit (seed : nativeint)
       if Js.typeof obj = "number" then
         begin 
           let u = Caml_nativeint_extern.of_float (Obj.magic obj) in
-          hash.contents <- caml_hash_mix_int hash.contents (u +~ u +~ 1n) ;
+          hash.contents <- caml_hash_mix_int hash.contents (u + u + 1) ;
           num.contents <- num.contents - 1;
         end 
       else if Js.typeof obj = "string" then 
@@ -134,10 +133,10 @@ let caml_hash (count : int) _limit (seed : nativeint)
           let tag = (size lsl 10) lor obj_tag in 
           if obj_tag = 248 (* Obj.object_tag*) then 
             hash.contents <- caml_hash_mix_int hash.contents 
-                (Caml_nativeint_extern.of_int (Obj.obj (Obj.field obj 1) : int))
+                (Obj.obj (Obj.field obj 1) : int)
           else 
             begin 
-              hash.contents <- caml_hash_mix_int hash.contents (Caml_nativeint_extern.of_int tag) ;
+              hash.contents <- caml_hash_mix_int hash.contents tag ;
               let block = 
                 let v = size - 1 in if v <  num.contents then v else num.contents in 
               for i = 0 to block do
@@ -154,7 +153,7 @@ let caml_hash (count : int) _limit (seed : nativeint)
             }
             return size
           }|}] obj (fun [@bs] v -> push_back queue v ) [@bs]) in    
-            hash.contents <- caml_hash_mix_int hash.contents (Caml_nativeint_extern.of_int ((size lsl 10) lor 0)) (*tag*) ;
+            hash.contents <- caml_hash_mix_int hash.contents  ((size lsl 10) lor 0) (*tag*) ;
           end
     done;
     caml_hash_final_mix hash.contents

jscomp/runtime/caml_hash.mli

@@ -26,4 +26,4 @@
 
 
 (** *)
-val caml_hash : int -> 'a -> nativeint -> Obj.t -> nativeint
+val caml_hash : int -> 'a -> int -> Obj.t -> int

jscomp/runtime/caml_hash_primitive.ml

@@ -29,29 +29,25 @@ let (>>>) = Caml_nativeint_extern.shift_right_logical
 let (|~) = Caml_nativeint_extern.logor
 let (^) = Caml_nativeint_extern.logxor
 
-external ( *~ ) : nativeint -> nativeint -> nativeint = "%int32_mul" 
-external ( +~ ) : nativeint -> nativeint -> nativeint = "%int32_add"
 
-
-
-let rotl32 (x : nativeint) n  = 
+let rotl32 (x : int) n  = 
   (x << n) |~ (x >>> (32 - n))
 
 external (.![]) : string -> int -> int = "charCodeAt" [@@bs.send]
 let caml_hash_mix_int h  d = 
   let d = ref d in 
-  d.contents <- d.contents *~ 0xcc9e2d51n ;
+  d.contents <- d.contents * 0xcc9e2d51 ;
   d.contents <- rotl32 d.contents 15 ;
-  d.contents <- d.contents *~ 0x1b873593n ;
+  d.contents <- d.contents * 0x1b873593 ;
   let h = ref (h ^ d.contents) in
   h.contents <- rotl32 h.contents 13 ;
-  h.contents +~ (h.contents << 2)  +~ 0xe6546b64n  
+  h.contents + (h.contents << 2)  + 0xe6546b64  
 
 let caml_hash_final_mix h = 
   let h = ref (h ^ (h >>> 16)) in
-  h.contents <- h.contents *~ 0x85ebca6bn ;
+  h.contents <- h.contents * 0x85ebca6b ;
   h.contents <- h.contents ^ (h.contents >>> 13);
-  h.contents <- h.contents *~ 0xc2b2ae35n ;
+  h.contents <- h.contents * 0xc2b2ae35 ;
   h.contents ^ (h.contents >>> 16)
   (* Caml_nativeint_extern.logand  (h.contents ^ (h.contents >>> 16)) 0x3FFFFFFFn *)
 
@@ -68,7 +64,7 @@ let caml_hash_mix_string h  s =
       (s.![j+2] lsl 16) lor 
       (s.![j+3] lsl 24)
     in
-    hash.contents <- caml_hash_mix_int hash.contents (Caml_nativeint_extern.of_int w)
+    hash.contents <- caml_hash_mix_int hash.contents  w
   done ;
   let modulo =  len land 0b11 in 
   if modulo <> 0 then 
@@ -83,9 +79,9 @@ let caml_hash_mix_string h  s =
            s.![len -2]
         else  s.![len - 1] 
       in 
-      hash.contents <- caml_hash_mix_int hash.contents (Caml_nativeint_extern.of_int w)
+      hash.contents <- caml_hash_mix_int hash.contents  w
     end;
-  hash.contents <- hash.contents ^ (Caml_nativeint_extern.of_int len) ;
+  hash.contents <- hash.contents ^ len ;
   hash.contents 
 
 

jscomp/runtime/caml_hash_primitive.mli

@@ -22,6 +22,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-val caml_hash_mix_int : nativeint -> nativeint -> nativeint
-val caml_hash_mix_string : nativeint -> string -> nativeint
-val caml_hash_final_mix : nativeint -> nativeint
+val caml_hash_mix_int : int -> int -> int
+val caml_hash_mix_string : int -> string -> int
+val caml_hash_final_mix : int -> int

lib/es6/caml_hash_primitive.js

@@ -7,19 +7,19 @@ function rotl32(x, n) {
 
 function caml_hash_mix_int(h, d) {
   var d$1 = d;
-  d$1 = Math.imul(d$1, 3432918353);
+  d$1 = Math.imul(d$1, -862048943);
   d$1 = rotl32(d$1, 15);
   d$1 = Math.imul(d$1, 461845907);
   var h$1 = h ^ d$1;
   h$1 = rotl32(h$1, 13);
-  return (h$1 + (h$1 << 2) | 0) + 3864292196 | 0;
+  return (h$1 + (h$1 << 2) | 0) - 430675100 | 0;
 }
 
 function caml_hash_final_mix(h) {
   var h$1 = h ^ (h >>> 16);
-  h$1 = Math.imul(h$1, 2246822507);
+  h$1 = Math.imul(h$1, -2048144789);
   h$1 = h$1 ^ (h$1 >>> 13);
-  h$1 = Math.imul(h$1, 3266489909);
+  h$1 = Math.imul(h$1, -1028477387);
   return h$1 ^ (h$1 >>> 16);
 }
 

lib/js/caml_hash_primitive.js

@@ -7,19 +7,19 @@ function rotl32(x, n) {
 
 function caml_hash_mix_int(h, d) {
   var d$1 = d;
-  d$1 = Math.imul(d$1, 3432918353);
+  d$1 = Math.imul(d$1, -862048943);
   d$1 = rotl32(d$1, 15);
   d$1 = Math.imul(d$1, 461845907);
   var h$1 = h ^ d$1;
   h$1 = rotl32(h$1, 13);
-  return (h$1 + (h$1 << 2) | 0) + 3864292196 | 0;
+  return (h$1 + (h$1 << 2) | 0) - 430675100 | 0;
 }
 
 function caml_hash_final_mix(h) {
   var h$1 = h ^ (h >>> 16);
-  h$1 = Math.imul(h$1, 2246822507);
+  h$1 = Math.imul(h$1, -2048144789);
   h$1 = h$1 ^ (h$1 >>> 13);
-  h$1 = Math.imul(h$1, 3266489909);
+  h$1 = Math.imul(h$1, -1028477387);
   return h$1 ^ (h$1 >>> 16);
 }