Revert changes that have become unnecessary after 45924dc

Author: cristianoc

jscomp/runtime/caml_obj.ml

@@ -119,7 +119,7 @@ let caml_lazy_make (fn : _ -> _) =
    In most cases, rec value comes from record/modules, 
    whose tag is 0, we optimize that case
 *)
-let caml_update_dummy0 (x : Caml_obj_extern.t) (y : Caml_obj_extern.t) : unit =
+let caml_update_dummy (x : Caml_obj_extern.t) (y : Caml_obj_extern.t) : unit =
   (* let len = Caml_obj_extern.length y in   
      for i = 0 to len - 1 do 
      Array.unsafe_set x i (Caml_obj_extern.field y i)
@@ -137,16 +137,6 @@ let caml_update_dummy0 (x : Caml_obj_extern.t) (y : Caml_obj_extern.t) : unit =
 (* [set_length] seems redundant here given that it is initialized as an array 
 *)
 
-let () = if [1] == [1] then Js.log(caml_update_dummy0)
-
-let caml_update_dummy : Caml_obj_extern.t -> Caml_obj_extern.t -> unit = fun%raw x y-> {|
-if (Array.isArray(x) && Array.isArray(y)) { return caml_update_dummy0(x,y) }
-else {
-  return Object.assign(x, y)
-}
-|}
-
-
 type 'a selector = 'a -> 'a -> 'a 
 
 module O = struct

jscomp/runtime/caml_obj_extern.ml

@@ -36,17 +36,8 @@ external length : t -> int = "#obj_length"
 (** The same as {!Obj.set_tag} *)
 external set_tag : t -> int -> unit = "tag" [@@bs.set]
 
+external size_of_t : t -> 'a Js.undefined =
+  "length" [@@bs.get]
 
-(* external size_of_t : t -> 'a Js.undefined =
-  "length" [@@bs.get] *)
-
-(* polymorphic variants are still arrays *)
-let size_of_t : t -> 'a Js.undefined = fun%raw o -> {|
-return Array.isArray(o) ? o.length : Object.keys(o).length
-|}
-
-let length : t -> int = fun%raw o -> {|
-return Array.isArray(o) ? o.length : Object.keys(o).length
-|}
 
 external magic : 'a -> 'b = "%identity"

jscomp/test/undef_regression_test.js

@@ -1,12 +1,11 @@
 'use strict';
 
-var Caml_obj_extern = require("../../lib/js/caml_obj_extern.js");
 
 function f(obj) {
   if (typeof obj === "function") {
     return /* () */0;
   } else {
-    var size = Caml_obj_extern.size_of_t(obj);
+    var size = obj.length;
     if (size !== undefined) {
       console.log(size);
       return /* () */0;

lib/js/caml_hash.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var Caml_obj_extern = require("./caml_obj_extern.js");
 var Caml_hash_primitive = require("./caml_hash_primitive.js");
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions.js");
 
@@ -78,7 +77,7 @@ function caml_hash(count, _limit, seed, obj) {
               ];
         }
         if (typeof obj$1 !== "function") {
-          var size = Caml_obj_extern.size_of_t(obj$1);
+          var size = obj$1.length;
           if (size !== undefined) {
             var obj_tag = /* XXX */obj$1.tag;
             var tag = (size << 10) | obj_tag;

lib/js/caml_module.js

@@ -103,4 +103,4 @@ function update_mod(shape, o, n) {
 
 exports.init_mod = init_mod;
 exports.update_mod = update_mod;
-/* Caml_obj Not a pure module */
+/* No side effect */

lib/js/caml_obj.js

@@ -2,7 +2,6 @@
 
 var Block = require("./block.js");
 var Caml_primitive = require("./caml_primitive.js");
-var Caml_obj_extern = require("./caml_obj_extern.js");
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions.js");
 
 function caml_obj_block(tag, size) {
@@ -12,7 +11,7 @@ function caml_obj_block(tag, size) {
 }
 
 function caml_obj_dup(x) {
-  var len = Caml_obj_extern.length(x);
+  var len = x.length | 0;
   var v = new Array(len);
   for(var i = 0 ,i_finish = len - 1 | 0; i <= i_finish; ++i){
     v[i] = x[i];
@@ -22,7 +21,7 @@ function caml_obj_dup(x) {
 }
 
 function caml_obj_truncate(x, new_size) {
-  var len = Caml_obj_extern.length(x);
+  var len = x.length | 0;
   if (new_size <= 0 || new_size > len) {
     throw [
           Caml_builtin_exceptions.invalid_argument,
@@ -50,8 +49,8 @@ function caml_lazy_make(fn) {
   return block;
 }
 
-function caml_update_dummy0(x, y) {
-  var len = Caml_obj_extern.length(y);
+function caml_update_dummy(x, y) {
+  var len = y.length | 0;
   for(var i = 0 ,i_finish = len - 1 | 0; i <= i_finish; ++i){
     x[i] = y[i];
   }
@@ -64,23 +63,6 @@ function caml_update_dummy0(x, y) {
   }
 }
 
-if (Block.__("::", [
-      1,
-      "[]"
-    ]) === Block.__("::", [
-      1,
-      "[]"
-    ])) {
-  console.log(caml_update_dummy0);
-}
-
-function caml_update_dummy (x,y){
-if (Array.isArray(x) && Array.isArray(y)) { return caml_update_dummy0(x,y) }
-else {
-  return Object.assign(x, y)
-}
-};
-
 function for_in (o,foo){
         for (var x in o) { foo(x) }
       };
@@ -193,8 +175,8 @@ function caml_compare(_a, _b) {
                   return 1;
                 }
               } else {
-                var len_a = Caml_obj_extern.length(a);
-                var len_b = Caml_obj_extern.length(b);
+                var len_a = a.length | 0;
+                var len_b = b.length | 0;
                 if (len_a === len_b) {
                   if (Array.isArray(a)) {
                     var a$1 = a;
@@ -363,8 +345,8 @@ function caml_equal(_a, _b) {
             } else if (tag_a === 256) {
               return a[1] === b[1];
             } else {
-              var len_a = Caml_obj_extern.length(a);
-              var len_b = Caml_obj_extern.length(b);
+              var len_a = a.length | 0;
+              var len_b = b.length | 0;
               if (len_a === len_b) {
                 if (Array.isArray(a)) {
                   var a$1 = a;
@@ -509,4 +491,4 @@ exports.caml_lessequal = caml_lessequal;
 exports.caml_min = caml_min;
 exports.caml_max = caml_max;
 exports.caml_obj_set_tag = caml_obj_set_tag;
-/*  Not a pure module */
+/* No side effect */

lib/js/caml_obj_extern.js

@@ -1,14 +1 @@
-'use strict';
-
-
-function size_of_t (o){
-return Array.isArray(o) ? o.length : Object.keys(o).length
-};
-
-function length (o){
-return Array.isArray(o) ? o.length : Object.keys(o).length
-};
-
-exports.size_of_t = size_of_t;
-exports.length = length;
-/* No side effect */
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */

lib/js/caml_weak.js

@@ -41,4 +41,4 @@ exports.caml_weak_get = caml_weak_get;
 exports.caml_weak_get_copy = caml_weak_get_copy;
 exports.caml_weak_check = caml_weak_check;
 exports.caml_weak_blit = caml_weak_blit;
-/* Caml_obj Not a pure module */
+/* No side effect */