fix #4599

bobzhang · bobzhang · commit 360fdd014942 · 2020-08-05T16:01:47.000+08:00
diff --git a/jscomp/core/lam_compile_primitive.ml b/jscomp/core/lam_compile_primitive.ml
@@ -492,11 +492,13 @@ let translate  loc
      Bytes is an int array in javascript
   *)
   | Pbytessetu
-  | Pbytessets -> 
+    -> 
     (match args with
      | [e;e0;e1] -> ensure_value_unit cxt.continuation 
                       (Js_of_lam_string.set_byte e e0 e1)
      | _ -> assert false)
+  | Pbytessets ->
+    E.runtime_call Js_runtime_modules.bytes "set" args
   | Pbytesrefu ->
     (match args with
      | [e;e1] -> Js_of_lam_string.ref_byte e e1
diff --git a/jscomp/runtime/caml_bytes.ml b/jscomp/runtime/caml_bytes.ml
@@ -30,6 +30,10 @@ external (.![]<-) : bytes -> int -> char -> unit = "%bytes_unsafe_set"
 external length : bytes -> int = "%bytes_length" 
 
 
+let set s i ch =
+  if i < 0 || i >= length s then  
+    raise (Invalid_argument "index out of bounds")
+  else s.![i] <- ch 
 
 let get s i =
   if i < 0 || i >= length s then
diff --git a/jscomp/runtime/caml_bytes.mli b/jscomp/runtime/caml_bytes.mli
@@ -26,6 +26,11 @@
 val caml_create_bytes : int -> bytes
 val caml_fill_bytes :  bytes -> int -> int -> char -> unit
 val get : bytes -> int -> char
+val set : 
+  bytes -> 
+  int -> 
+  char -> 
+  unit
 val bytes_to_string : bytes -> string 
 val caml_blit_bytes : bytes -> int -> bytes -> int -> int -> unit
 
diff --git a/jscomp/runtime/release.ninja b/jscomp/runtime/release.ninja
@@ -29,7 +29,7 @@ build runtime/caml_hash_primitive.cmj : cc_cmi runtime/caml_hash_primitive.ml |
 build runtime/caml_hash_primitive.cmi : cc runtime/caml_hash_primitive.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_int32.cmj : cc_cmi runtime/caml_int32.ml | runtime/caml_int32.cmi runtime/caml_nativeint_extern.cmj
 build runtime/caml_int32.cmi : cc runtime/caml_int32.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_int64.cmj : cc_cmi runtime/caml_int64.ml | runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_int64.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj runtime/js.cmj
+build runtime/caml_int64.cmj : cc_cmi runtime/caml_int64.ml | runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_int64.cmi runtime/caml_nativeint_extern.cmj runtime/caml_primitive.cmj runtime/caml_string_extern.cmj runtime/js.cmj
 build runtime/caml_int64.cmi : cc runtime/caml_int64.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_io.cmj : cc_cmi runtime/caml_io.ml | runtime/caml_io.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmj runtime/js.cmj
 build runtime/caml_io.cmi : cc runtime/caml_io.mli | runtime/bs_stdlib_mini.cmi runtime/caml_undefined_extern.cmj runtime/js.cmi runtime/js.cmj
@@ -39,9 +39,9 @@ build runtime/caml_md5.cmj : cc_cmi runtime/caml_md5.ml | runtime/caml_array_ext
 build runtime/caml_md5.cmi : cc runtime/caml_md5.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_module.cmj : cc_cmi runtime/caml_module.ml | runtime/caml_array_extern.cmj runtime/caml_module.cmi runtime/caml_obj.cmj
 build runtime/caml_module.cmi : cc runtime/caml_module.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_obj.cmj : cc_cmi runtime/caml_obj.ml | runtime/caml_array_extern.cmj runtime/caml_obj.cmi runtime/caml_option.cmj runtime/js.cmj
+build runtime/caml_obj.cmj : cc_cmi runtime/caml_obj.ml | runtime/caml_array_extern.cmj runtime/caml_obj.cmi runtime/caml_option.cmj runtime/caml_primitive.cmj runtime/js.cmj
 build runtime/caml_obj.cmi : cc runtime/caml_obj.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_oo.cmj : cc_cmi runtime/caml_oo.ml | runtime/caml_array_extern.cmj runtime/caml_exceptions.cmj runtime/caml_oo.cmi
+build runtime/caml_oo.cmj : cc_cmi runtime/caml_oo.ml | runtime/caml_array.cmj runtime/caml_array_extern.cmj runtime/caml_exceptions.cmj runtime/caml_oo.cmi
 build runtime/caml_oo.cmi : cc runtime/caml_oo.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_option.cmj : cc_cmi runtime/caml_option.ml | runtime/caml_option.cmi runtime/caml_undefined_extern.cmj runtime/js.cmj
 build runtime/caml_option.cmi : cc runtime/caml_option.mli | runtime/bs_stdlib_mini.cmi runtime/caml_undefined_extern.cmj runtime/js.cmi runtime/js.cmj
@@ -61,10 +61,10 @@ build runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj : cc
 build runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj : cc runtime/caml_float_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_int32_extern.cmi runtime/caml_int32_extern.cmj : cc runtime/caml_int32_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj : cc runtime/caml_int64_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj : cc runtime/caml_js_exceptions.ml | runtime/bs_stdlib_mini.cmi runtime/caml_exceptions.cmj runtime/js.cmi runtime/js.cmj
+build runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj : cc runtime/caml_js_exceptions.ml | runtime/bs_stdlib_mini.cmi runtime/caml_exceptions.cmj runtime/caml_option.cmj runtime/js.cmi runtime/js.cmj
 build runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj : cc runtime/caml_nativeint_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_oo_curry.cmi runtime/caml_oo_curry.cmj : cc runtime/caml_oo_curry.ml | runtime/bs_stdlib_mini.cmi runtime/caml_oo.cmj runtime/curry.cmj runtime/js.cmi runtime/js.cmj
 build runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj : cc runtime/caml_string_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj : cc runtime/caml_undefined_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/curry.cmi runtime/curry.cmj : cc runtime/curry.ml | runtime/bs_stdlib_mini.cmi runtime/caml_array_extern.cmj runtime/js.cmi runtime/js.cmj
+build runtime/curry.cmi runtime/curry.cmj : cc runtime/curry.ml | runtime/bs_stdlib_mini.cmi runtime/caml_array.cmj runtime/caml_array_extern.cmj runtime/js.cmi runtime/js.cmj
 build runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml_array.cmi runtime/caml_array.cmj runtime/caml_bytes.cmi runtime/caml_bytes.cmj runtime/caml_float.cmi runtime/caml_float.cmj runtime/caml_format.cmi runtime/caml_format.cmj runtime/caml_gc.cmi runtime/caml_gc.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_int32.cmi runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_int64.cmj runtime/caml_io.cmi runtime/caml_io.cmj runtime/caml_lexer.cmi runtime/caml_lexer.cmj runtime/caml_md5.cmi runtime/caml_md5.cmj runtime/caml_module.cmi runtime/caml_module.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_oo.cmi runtime/caml_oo.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_parser.cmi runtime/caml_parser.cmj runtime/caml_primitive.cmi runtime/caml_primitive.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/caml_string.cmi runtime/caml_string.cmj runtime/caml_sys.cmi runtime/caml_sys.cmj runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj runtime/caml_int32_extern.cmi runtime/caml_int32_extern.cmj runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj runtime/caml_oo_curry.cmi runtime/caml_oo_curry.cmj runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.cmj
diff --git a/jscomp/test/bytes_split_gpr_743_test.js b/jscomp/test/bytes_split_gpr_743_test.js
@@ -38,11 +38,11 @@ var b = [
   0
 ];
 
-b[0] = /* "a" */97;
+Caml_bytes.set(b, 0, /* "a" */97);
 
-b[1] = /* "b" */98;
+Caml_bytes.set(b, 1, /* "b" */98);
 
-b[2] = /* "c" */99;
+Caml_bytes.set(b, 2, /* "c" */99);
 
 Bytes.blit(b, 0, b, 1, 2);
 
@@ -61,11 +61,11 @@ var b$1 = [
   0
 ];
 
-b$1[0] = /* "a" */97;
+Caml_bytes.set(b$1, 0, /* "a" */97);
 
-b$1[1] = /* "b" */98;
+Caml_bytes.set(b$1, 1, /* "b" */98);
 
-b$1[2] = /* "c" */99;
+Caml_bytes.set(b$1, 2, /* "c" */99);
 
 Bytes.blit(b$1, 1, b$1, 0, 2);
 
diff --git a/jscomp/test/gray_code_test.js b/jscomp/test/gray_code_test.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var Bytes = require("../../lib/js/bytes.js");
+var Caml_bytes = require("../../lib/js/caml_bytes.js");
 
 function gray_encode(b) {
   return b ^ (b >>> 1);
@@ -29,7 +30,7 @@ function bool_string(len, n) {
     var n$1 = _n;
     var i = _i;
     if ((n$1 & 1) === 1) {
-      s[i] = /* "1" */49;
+      Caml_bytes.set(s, i, /* "1" */49);
     }
     if (i <= 0) {
       return s;
diff --git a/jscomp/test/ocaml_parsetree_test.js b/jscomp/test/ocaml_parsetree_test.js
@@ -12018,7 +12018,7 @@ function remove_underscores(s) {
     }
     var c = Caml_string.get(s, src);
     if (c !== 95) {
-      b[dst] = c;
+      Caml_bytes.set(b, dst, c);
       _dst = dst + 1 | 0;
       _src = src + 1 | 0;
       continue ;
diff --git a/jscomp/test/ocaml_re_test.js b/jscomp/test/ocaml_re_test.js
@@ -1781,9 +1781,8 @@ function is_charset(_param) {
 function split(s, cm) {
   var _t = s;
   var f = function (i, j) {
-    cm[i] = /* "\001" */1;
-    cm[j + 1 | 0] = /* "\001" */1;
-    
+    Caml_bytes.set(cm, i, /* "\001" */1);
+    return Caml_bytes.set(cm, j + 1 | 0, /* "\001" */1);
   };
   while(true) {
     var t = _t;
@@ -1902,14 +1901,14 @@ function flatten_cmap(cm) {
   var c = Caml_bytes.caml_create_bytes(256);
   var col_repr = Caml_bytes.caml_create_bytes(256);
   var v = 0;
-  c[0] = /* "\000" */0;
-  col_repr[0] = /* "\000" */0;
+  Caml_bytes.set(c, 0, /* "\000" */0);
+  Caml_bytes.set(col_repr, 0, /* "\000" */0);
   for(var i = 1; i <= 255; ++i){
     if (Caml_bytes.get(cm, i) !== /* "\000" */0) {
       v = v + 1 | 0;
     }
-    c[i] = Char.chr(v);
-    col_repr[v] = Char.chr(i);
+    Caml_bytes.set(c, i, Char.chr(v));
+    Caml_bytes.set(col_repr, v, Char.chr(i));
   }
   return [
           c,
diff --git a/jscomp/test/ocaml_typedtree_test.js b/jscomp/test/ocaml_typedtree_test.js
@@ -23255,7 +23255,7 @@ function remove_underscores(s) {
     }
     var c = Caml_string.get(s, src);
     if (c !== 95) {
-      b[dst] = c;
+      Caml_bytes.set(b, dst, c);
       _dst = dst + 1 | 0;
       _src = src + 1 | 0;
       continue ;
diff --git a/jscomp/test/parser_api.js b/jscomp/test/parser_api.js
@@ -1330,8 +1330,7 @@ function get(tbl, ind) {
 }
 
 function set(tbl, ind, c) {
-  Caml_array.caml_array_get(tbl, Caml_int32.div(ind, Sys.max_string_length))[Caml_int32.mod_(ind, Sys.max_string_length)] = c;
-  
+  return Caml_bytes.set(Caml_array.caml_array_get(tbl, Caml_int32.div(ind, Sys.max_string_length)), Caml_int32.mod_(ind, Sys.max_string_length), c);
 }
 
 function blit(src, srcoff, dst, dstoff, len) {
@@ -15261,7 +15260,7 @@ function remove_underscores(s) {
     }
     var c = Caml_string.get(s, src);
     if (c !== 95) {
-      b[dst] = c;
+      Caml_bytes.set(b, dst, c);
       _dst = dst + 1 | 0;
       _src = src + 1 | 0;
       continue ;
diff --git a/jscomp/test/qcc.js b/jscomp/test/qcc.js
@@ -214,7 +214,7 @@ function next(param) {
       var e = _e;
       var match = peekch(undefined);
       if (match !== 34) {
-        glo[e] = getq(undefined);
+        Caml_bytes.set(glo, e, getq(undefined));
         _e = e + 1 | 0;
         continue ;
       }
@@ -265,7 +265,7 @@ function next(param) {
     while(true) {
       var ch$1 = _ch;
       var n$1 = _n$1;
-      s[n$1] = ch$1;
+      Caml_bytes.set(s, n$1, ch$1);
       if (!isid(peekch(undefined))) {
         return {
                 TAG: /* Sym */3,
@@ -351,7 +351,7 @@ var opos = {
 function out(x) {
   if (x !== 0) {
     out(x / 256 | 0);
-    obuf[opos.contents] = Char.chr(x & 255);
+    Caml_bytes.set(obuf, opos.contents, Char.chr(x & 255));
     opos.contents = opos.contents + 1 | 0;
     return ;
   }
@@ -361,7 +361,7 @@ function out(x) {
 function le(n, x) {
   for(var i = 0 ,i_finish = n / 8 | 0; i < i_finish; ++i){
     var $$byte = (x >>> (i << 3)) & 255;
-    obuf[opos.contents] = Char.chr($$byte);
+    Caml_bytes.set(obuf, opos.contents, Char.chr($$byte));
     opos.contents = opos.contents + 1 | 0;
   }
   
@@ -490,10 +490,10 @@ function patchlval(param) {
   var n = lval.contents[0];
   if (n.TAG) {
     opos.contents = opos.contents - n._0 | 0;
+    return ;
   } else {
-    obuf[opos.contents - n._0 | 0] = /* "\141" */141;
+    return Caml_bytes.set(obuf, opos.contents - n._0 | 0, /* "\141" */141);
   }
-  
 }
 
 function read(param) {
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
@@ -111907,11 +111907,13 @@ let translate  loc
      Bytes is an int array in javascript
   *)
   | Pbytessetu
-  | Pbytessets -> 
+    -> 
     (match args with
      | [e;e0;e1] -> ensure_value_unit cxt.continuation 
                       (Js_of_lam_string.set_byte e e0 e1)
      | _ -> assert false)
+  | Pbytessets ->
+    E.runtime_call Js_runtime_modules.bytes "set" args
   | Pbytesrefu ->
     (match args with
      | [e;e1] -> Js_of_lam_string.ref_byte e e1
diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml b/lib/4.06.1/unstable/js_refmt_compiler.ml
@@ -111907,11 +111907,13 @@ let translate  loc
      Bytes is an int array in javascript
   *)
   | Pbytessetu
-  | Pbytessets -> 
+    -> 
     (match args with
      | [e;e0;e1] -> ensure_value_unit cxt.continuation 
                       (Js_of_lam_string.set_byte e e0 e1)
      | _ -> assert false)
+  | Pbytessets ->
+    E.runtime_call Js_runtime_modules.bytes "set" args
   | Pbytesrefu ->
     (match args with
      | [e;e1] -> Js_of_lam_string.ref_byte e e1
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
@@ -393999,11 +393999,13 @@ let translate  loc
      Bytes is an int array in javascript
   *)
   | Pbytessetu
-  | Pbytessets -> 
+    -> 
     (match args with
      | [e;e0;e1] -> ensure_value_unit cxt.continuation 
                       (Js_of_lam_string.set_byte e e0 e1)
      | _ -> assert false)
+  | Pbytessets ->
+    E.runtime_call Js_runtime_modules.bytes "set" args
   | Pbytesrefu ->
     (match args with
      | [e;e1] -> Js_of_lam_string.ref_byte e e1
diff --git a/lib/es6/caml_bytes.js b/lib/es6/caml_bytes.js
@@ -1,6 +1,18 @@
 
 
 
+function set(s, i, ch) {
+  if (i < 0 || i >= s.length) {
+    throw {
+          RE_EXN_ID: "Invalid_argument",
+          _1: "index out of bounds",
+          Error: new Error()
+        };
+  }
+  s[i] = ch;
+  
+}
+
 function get(s, i) {
   if (i < 0 || i >= s.length) {
     throw {
@@ -185,6 +197,7 @@ export {
   caml_create_bytes ,
   caml_fill_bytes ,
   get ,
+  set ,
   bytes_to_string ,
   caml_blit_bytes ,
   caml_blit_string ,
diff --git a/lib/es6/camlinternalFormat.js b/lib/es6/camlinternalFormat.js
@@ -23,16 +23,15 @@ function create_char_set(param) {
 function add_in_char_set(char_set, c) {
   var str_ind = (c >>> 3);
   var mask = (1 << (c & 7));
-  char_set[str_ind] = Pervasives.char_of_int(Caml_bytes.get(char_set, str_ind) | mask);
-  
+  return Caml_bytes.set(char_set, str_ind, Pervasives.char_of_int(Caml_bytes.get(char_set, str_ind) | mask));
 }
 
 var freeze_char_set = Bytes.to_string;
 
 function rev_char_set(char_set) {
   var char_set$prime = Bytes.make(32, /* "\000" */0);
   for(var i = 0; i <= 31; ++i){
-    char_set$prime[i] = Pervasives.char_of_int(Caml_string.get(char_set, i) ^ 255);
+    Caml_bytes.set(char_set$prime, i, Pervasives.char_of_int(Caml_string.get(char_set, i) ^ 255));
   }
   return Caml_bytes.bytes_to_string(char_set$prime);
 }
@@ -229,7 +228,7 @@ function buffer_check_size(buf, overhead) {
 
 function buffer_add_char(buf, c) {
   buffer_check_size(buf, 1);
-  buf.bytes[buf.ind] = c;
+  Caml_bytes.set(buf.bytes, buf.ind, c);
   buf.ind = buf.ind + 1 | 0;
   
 }
@@ -3159,10 +3158,10 @@ function fix_padding(padty, width, str) {
         break;
     case /* Zeros */2 :
         if (len > 0 && (Caml_string.get(str, 0) === /* "+" */43 || Caml_string.get(str, 0) === /* "-" */45 || Caml_string.get(str, 0) === /* " " */32)) {
-          res[0] = Caml_string.get(str, 0);
+          Caml_bytes.set(res, 0, Caml_string.get(str, 0));
           $$String.blit(str, 1, res, (width$1 - len | 0) + 1 | 0, len - 1 | 0);
         } else if (len > 1 && Caml_string.get(str, 0) === /* "0" */48 && (Caml_string.get(str, 1) === /* "x" */120 || Caml_string.get(str, 1) === /* "X" */88)) {
-          res[1] = Caml_string.get(str, 1);
+          Caml_bytes.set(res, 1, Caml_string.get(str, 1));
           $$String.blit(str, 2, res, (width$1 - len | 0) + 2 | 0, len - 2 | 0);
         } else {
           $$String.blit(str, 0, res, width$1 - len | 0, len);
@@ -3206,7 +3205,7 @@ function fix_int_precision(prec, str) {
       case 5 :
           if ((prec$1 + 2 | 0) > len && len > 1 && (Caml_string.get(str, 1) === /* "x" */120 || Caml_string.get(str, 1) === /* "X" */88)) {
             var res = Bytes.make(prec$1 + 2 | 0, /* "0" */48);
-            res[1] = Caml_string.get(str, 1);
+            Caml_bytes.set(res, 1, Caml_string.get(str, 1));
             $$String.blit(str, 2, res, (prec$1 - len | 0) + 4 | 0, len - 2 | 0);
             return Caml_bytes.bytes_to_string(res);
           }
@@ -3234,7 +3233,7 @@ function fix_int_precision(prec, str) {
           return str;
         }
         var res$1 = Bytes.make(prec$1 + 1 | 0, /* "0" */48);
-        res$1[0] = c;
+        Caml_bytes.set(res$1, 0, c);
         $$String.blit(str, 1, res$1, (prec$1 - len | 0) + 2 | 0, len - 1 | 0);
         return Caml_bytes.bytes_to_string(res$1);
     case 2 :
diff --git a/lib/es6/digest.js b/lib/es6/digest.js
@@ -117,7 +117,7 @@ function from_hex(s) {
   };
   var result = Caml_bytes.caml_create_bytes(16);
   for(var i = 0; i <= 15; ++i){
-    result[i] = Char.chr($$byte((i << 1)));
+    Caml_bytes.set(result, i, Char.chr($$byte((i << 1))));
   }
   return Caml_bytes.bytes_to_string(result);
 }
diff --git a/lib/es6/genlex.js b/lib/es6/genlex.js
@@ -32,7 +32,7 @@ function store(c) {
     Bytes.blit(buffer.contents, 0, newbuffer, 0, bufpos.contents);
     buffer.contents = newbuffer;
   }
-  buffer.contents[bufpos.contents] = c;
+  Caml_bytes.set(buffer.contents, bufpos.contents, c);
   bufpos.contents = bufpos.contents + 1 | 0;
   
 }
diff --git a/lib/js/caml_bytes.js b/lib/js/caml_bytes.js
diff --git a/lib/js/camlinternalFormat.js b/lib/js/camlinternalFormat.js
diff --git a/lib/js/digest.js b/lib/js/digest.js
diff --git a/lib/js/genlex.js b/lib/js/genlex.js

Original file line number	Diff line number	Diff line change
`@@ -12018,7 +12018,7 @@ function remove_underscores(s) {`
`12018`	`12018`	`}`
`12019`	`12019`	`var c = Caml_string.get(s, src);`
`12020`	`12020`	`if (c !== 95) {`
`12021`		`- b[dst] = c;`
	`12021`	`+ Caml_bytes.set(b, dst, c);`
`12022`	`12022`	`_dst = dst + 1 \| 0;`
`12023`	`12023`	`_src = src + 1 \| 0;`
`12024`	`12024`	`continue ;`
Original file line number	Diff line number	Diff line change
`@@ -23255,7 +23255,7 @@ function remove_underscores(s) {`
`23255`	`23255`	`}`
`23256`	`23256`	`var c = Caml_string.get(s, src);`
`23257`	`23257`	`if (c !== 95) {`
`23258`		`- b[dst] = c;`
	`23258`	`+ Caml_bytes.set(b, dst, c);`
`23259`	`23259`	`_dst = dst + 1 \| 0;`
`23260`	`23260`	`_src = src + 1 \| 0;`
`23261`	`23261`	`continue ;`
Original file line number	Diff line number	Diff line change
`@@ -1330,8 +1330,7 @@ function get(tbl, ind) {`
`1330`	`1330`	`}`
`1331`	`1331`
`1332`	`1332`	`function set(tbl, ind, c) {`
`1333`		`- Caml_array.caml_array_get(tbl, Caml_int32.div(ind, Sys.max_string_length))[Caml_int32.mod_(ind, Sys.max_string_length)] = c;`
`1334`		`-`
	`1333`	`+ return Caml_bytes.set(Caml_array.caml_array_get(tbl, Caml_int32.div(ind, Sys.max_string_length)), Caml_int32.mod_(ind, Sys.max_string_length), c);`
`1335`	`1334`	`}`
`1336`	`1335`
`1337`	`1336`	`function blit(src, srcoff, dst, dstoff, len) {`
`@@ -15261,7 +15260,7 @@ function remove_underscores(s) {`
`15261`	`15260`	`}`
`15262`	`15261`	`var c = Caml_string.get(s, src);`
`15263`	`15262`	`if (c !== 95) {`
`15264`		`- b[dst] = c;`
	`15263`	`+ Caml_bytes.set(b, dst, c);`
`15265`	`15264`	`_dst = dst + 1 \| 0;`
`15266`	`15265`	`_src = src + 1 \| 0;`
`15267`	`15266`	`continue ;`