Turn on strict submodule coercion optimization

Author: bobzhang

jscomp/core/lam.ml

@@ -646,30 +646,35 @@ let prim ~primitive:(prim : Lam_primitive.t) ~args loc  : t =
         end
       | _ -> default ()
     end
-
   | _ -> 
-
-#if 0 then  
     match prim with 
     | Pmakeblock(size,Blk_module fields,_)->
-      let rec aux fields args (var : Ident.t) =
+      let rec aux fields args (var : Ident.t) i =
         match fields, args with 
         | [], [] -> true 
-        | f :: fields, Lprim {primitive = Pfield (_, Fld_module f1); args = [Lglobal_module v1 | Lvar v1]} :: args 
-          -> f = f1 && Ident.same var v1 && aux fields args var 
+        | f :: fields, Lprim {primitive = Pfield (pos, Fld_module f1); args = [Lglobal_module v1 | Lvar v1]} :: args 
+          -> 
+            pos = i && 
+            f = f1 &&
+            Ident.same var v1 && aux fields args var (i + 1)
         | _, _ -> false in   
       begin match fields, args with   
       | field1 :: rest, 
-          Lprim{primitive = Pfield (_, Fld_module f1); args = [Lglobal_module v1 | Lvar v1 as lam]} :: args1
+          Lprim{primitive = Pfield (pos, Fld_module f1); args = [Lglobal_module v1 | Lvar v1 as lam]} :: args1
           ->
-          if field1 = f1 && aux rest args1 v1 then 
+          if pos = 0 && field1 = f1 && aux rest args1 v1 1 then 
             lam
           else 
             default ()
         | _ -> default ()                    
-      end
+      end 
+      (* In this level, include is already expanded, so that 
+        {[
+          { x0 : y0 ; x1 : y1 }
+        ]}
+        such module x can indeed be replaced by module y
+      *)
     | _ ->    
-#end          
       default ()
 
 let not_ loc x  : t =

jscomp/test/defunctor_make_test.js

@@ -8,9 +8,7 @@ function getcompare(x) {
 }
 
 function Make(M) {
-  return {
-          compare: M.compare
-        };
+  return M;
 }
 
 var Comparable = {

jscomp/test/global_module_alias_test.js

@@ -38,60 +38,7 @@ function Make(U) {
   v.contents = v.contents + 1 | 0;
   v.contents = v.contents + 1 | 0;
   v.contents = v.contents + 1 | 0;
-  return {
-          length: U.length,
-          compare_lengths: U.compare_lengths,
-          compare_length_with: U.compare_length_with,
-          cons: U.cons,
-          hd: U.hd,
-          tl: U.tl,
-          nth: U.nth,
-          nth_opt: U.nth_opt,
-          rev: U.rev,
-          init: U.init,
-          append: U.append,
-          rev_append: U.rev_append,
-          concat: U.concat,
-          flatten: U.flatten,
-          iter: U.iter,
-          iteri: U.iteri,
-          map: U.map,
-          mapi: U.mapi,
-          rev_map: U.rev_map,
-          fold_left: U.fold_left,
-          fold_right: U.fold_right,
-          iter2: U.iter2,
-          map2: U.map2,
-          rev_map2: U.rev_map2,
-          fold_left2: U.fold_left2,
-          fold_right2: U.fold_right2,
-          for_all: U.for_all,
-          exists: U.exists,
-          for_all2: U.for_all2,
-          exists2: U.exists2,
-          mem: U.mem,
-          memq: U.memq,
-          find: U.find,
-          find_opt: U.find_opt,
-          filter: U.filter,
-          find_all: U.find_all,
-          partition: U.partition,
-          assoc: U.assoc,
-          assoc_opt: U.assoc_opt,
-          assq: U.assq,
-          assq_opt: U.assq_opt,
-          mem_assoc: U.mem_assoc,
-          mem_assq: U.mem_assq,
-          remove_assoc: U.remove_assoc,
-          remove_assq: U.remove_assq,
-          split: U.split,
-          combine: U.combine,
-          sort: U.sort,
-          stable_sort: U.stable_sort,
-          fast_sort: U.fast_sort,
-          sort_uniq: U.sort_uniq,
-          merge: U.merge
-        };
+  return U;
 }
 
 function f(param) {
@@ -101,60 +48,7 @@ function f(param) {
   v.contents = v.contents + 1 | 0;
   v.contents = v.contents + 1 | 0;
   v.contents = v.contents + 1 | 0;
-  return {
-          length: List.length,
-          compare_lengths: List.compare_lengths,
-          compare_length_with: List.compare_length_with,
-          cons: List.cons,
-          hd: List.hd,
-          tl: List.tl,
-          nth: List.nth,
-          nth_opt: List.nth_opt,
-          rev: List.rev,
-          init: List.init,
-          append: List.append,
-          rev_append: List.rev_append,
-          concat: List.concat,
-          flatten: List.flatten,
-          iter: List.iter,
-          iteri: List.iteri,
-          map: List.map,
-          mapi: List.mapi,
-          rev_map: List.rev_map,
-          fold_left: List.fold_left,
-          fold_right: List.fold_right,
-          iter2: List.iter2,
-          map2: List.map2,
-          rev_map2: List.rev_map2,
-          fold_left2: List.fold_left2,
-          fold_right2: List.fold_right2,
-          for_all: List.for_all,
-          exists: List.exists,
-          for_all2: List.for_all2,
-          exists2: List.exists2,
-          mem: List.mem,
-          memq: List.memq,
-          find: List.find,
-          find_opt: List.find_opt,
-          filter: List.filter,
-          find_all: List.find_all,
-          partition: List.partition,
-          assoc: List.assoc,
-          assoc_opt: List.assoc_opt,
-          assq: List.assq,
-          assq_opt: List.assq_opt,
-          mem_assoc: List.mem_assoc,
-          mem_assq: List.mem_assq,
-          remove_assoc: List.remove_assoc,
-          remove_assq: List.remove_assq,
-          split: List.split,
-          combine: List.combine,
-          sort: List.sort,
-          stable_sort: List.stable_sort,
-          fast_sort: List.fast_sort,
-          sort_uniq: List.sort_uniq,
-          merge: List.merge
-        };
+  return List;
 }
 
 eq("File \"global_module_alias_test.ml\", line 51, characters 5-12", List.length(/* :: */[
@@ -189,60 +83,7 @@ v.contents = v.contents + 1 | 0;
 
 v.contents = v.contents + 1 | 0;
 
-var H = {
-  length: List.length,
-  compare_lengths: List.compare_lengths,
-  compare_length_with: List.compare_length_with,
-  cons: List.cons,
-  hd: List.hd,
-  tl: List.tl,
-  nth: List.nth,
-  nth_opt: List.nth_opt,
-  rev: List.rev,
-  init: List.init,
-  append: List.append,
-  rev_append: List.rev_append,
-  concat: List.concat,
-  flatten: List.flatten,
-  iter: List.iter,
-  iteri: List.iteri,
-  map: List.map,
-  mapi: List.mapi,
-  rev_map: List.rev_map,
-  fold_left: List.fold_left,
-  fold_right: List.fold_right,
-  iter2: List.iter2,
-  map2: List.map2,
-  rev_map2: List.rev_map2,
-  fold_left2: List.fold_left2,
-  fold_right2: List.fold_right2,
-  for_all: List.for_all,
-  exists: List.exists,
-  for_all2: List.for_all2,
-  exists2: List.exists2,
-  mem: List.mem,
-  memq: List.memq,
-  find: List.find,
-  find_opt: List.find_opt,
-  filter: List.filter,
-  find_all: List.find_all,
-  partition: List.partition,
-  assoc: List.assoc,
-  assoc_opt: List.assoc_opt,
-  assq: List.assq,
-  assq_opt: List.assq_opt,
-  mem_assoc: List.mem_assoc,
-  mem_assq: List.mem_assq,
-  remove_assoc: List.remove_assoc,
-  remove_assq: List.remove_assq,
-  split: List.split,
-  combine: List.combine,
-  sort: List.sort,
-  stable_sort: List.stable_sort,
-  fast_sort: List.fast_sort,
-  sort_uniq: List.sort_uniq,
-  merge: List.merge
-};
+var H = List;
 
 eq("File \"global_module_alias_test.ml\", line 57, characters 5-12", v.contents, 12);
 
@@ -266,60 +107,7 @@ function xx(param) {
   v.contents = v.contents + 1 | 0;
   v.contents = v.contents + 1 | 0;
   v.contents = v.contents + 1 | 0;
-  return {
-          length: List.length,
-          compare_lengths: List.compare_lengths,
-          compare_length_with: List.compare_length_with,
-          cons: List.cons,
-          hd: List.hd,
-          tl: List.tl,
-          nth: List.nth,
-          nth_opt: List.nth_opt,
-          rev: List.rev,
-          init: List.init,
-          append: List.append,
-          rev_append: List.rev_append,
-          concat: List.concat,
-          flatten: List.flatten,
-          iter: List.iter,
-          iteri: List.iteri,
-          map: List.map,
-          mapi: List.mapi,
-          rev_map: List.rev_map,
-          fold_left: List.fold_left,
-          fold_right: List.fold_right,
-          iter2: List.iter2,
-          map2: List.map2,
-          rev_map2: List.rev_map2,
-          fold_left2: List.fold_left2,
-          fold_right2: List.fold_right2,
-          for_all: List.for_all,
-          exists: List.exists,
-          for_all2: List.for_all2,
-          exists2: List.exists2,
-          mem: List.mem,
-          memq: List.memq,
-          find: List.find,
-          find_opt: List.find_opt,
-          filter: List.filter,
-          find_all: List.find_all,
-          partition: List.partition,
-          assoc: List.assoc,
-          assoc_opt: List.assoc_opt,
-          assq: List.assq,
-          assq_opt: List.assq_opt,
-          mem_assoc: List.mem_assoc,
-          mem_assq: List.mem_assq,
-          remove_assoc: List.remove_assoc,
-          remove_assq: List.remove_assq,
-          split: List.split,
-          combine: List.combine,
-          sort: List.sort,
-          stable_sort: List.stable_sort,
-          fast_sort: List.fast_sort,
-          sort_uniq: List.sort_uniq,
-          merge: List.merge
-        };
+  return List;
 }
 
 eq("File \"global_module_alias_test.ml\", line 86, characters 5-12", g(/* () */0), 4);

jscomp/test/gpr_3865.js

@@ -2,9 +2,7 @@
 
 var Gpr_3865_foo = require("./gpr_3865_foo.js");
 
-var B = {
-  $$return: Gpr_3865_foo.$$return
-};
+var B = Gpr_3865_foo;
 
 console.log(Gpr_3865_foo.$$return);
 

jscomp/test/gpr_3865_bar.js

@@ -2,9 +2,7 @@
 
 
 function Make(M) {
-  return {
-          $$return: M.$$return
-        };
+  return M;
 }
 
 exports.Make = Make;