Merge pull request #1089 from bloomberg/remove_Module_opt

recursive apply field opt, bug fix for alias_tbl

Author: bobzhang

jscomp/bin/whole_compiler.ml

@@ -69698,13 +69698,13 @@ val string_of_primitive : Lam.primitive -> string
 val kind_of_lambda_block : Lam_stats.boxed_nullable -> Lam.t list -> Lam_stats.kind
 
 val field_flatten_get : 
-  Lam.t -> Ident.t -> int -> Lam_stats.ident_tbl -> Lam.t
+  (unit -> Lam.t) -> Ident.t -> int -> Lam_stats.ident_tbl -> Lam.t
 
 
 
 
 
-val alias : Lam_stats.meta ->
+val alias_ident_or_global : Lam_stats.meta ->
   Ident.t -> Ident.t -> Lam_stats.kind -> Lambda.let_kind -> unit 
 
 
@@ -69922,7 +69922,7 @@ let refine_let
   | None , _, _ -> 
     Lam.let_ Strict param arg  l
 
-let alias (meta : Lam_stats.meta) (k:Ident.t) (v:Ident.t) 
+let alias_ident_or_global (meta : Lam_stats.meta) (k:Ident.t) (v:Ident.t) 
     (v_kind : Lam_stats.kind) (let_kind : Lambda.let_kind) =
   (** treat rec as Strict, k is assigned to v 
       {[ let k = v ]}
@@ -70002,13 +70002,13 @@ let field_flatten_get
       ~args:[Lam.prim ~primitive:(Pgetglobal g) ~args:[] Location.none] Location.none
   | Some (ImmutableBlock (arr, _)) -> 
     begin match arr.(i) with 
-      | NA -> lam 
+      | NA -> lam ()
       | SimpleForm l -> l
     end
   | Some (Constant (Const_block (_,_,ls))) -> 
     Lam.const (List.nth  ls i)
   | Some _
-  | None -> lam 
+  | None -> lam ()
 
 
 (* TODO: check that if label belongs to a different 
@@ -93705,12 +93705,12 @@ let collect_helper  (meta : Lam_stats.meta) (lam : Lam.t)  =
 
     | Lprim {primitive = Pgetglobal v; args = []; _} 
       -> 
-        Lam_util.alias meta  ident v (Module  v) kind; 
+        Lam_util.alias_ident_or_global meta  ident v (Module  v) kind; 
     | Lvar v 
       -> 
         (
          (* if Ident.global v then  *)
-         Lam_util.alias meta  ident v NA kind
+         Lam_util.alias_ident_or_global meta  ident v NA kind
            (* enven for not subsitution, it still propogate some properties *)
            (* else () *)
         )
@@ -95438,6 +95438,8 @@ val simplify_alias :
   Lam.t ->
   Lam.t
 
+
+
 end = struct
 #1 "lam_pass_remove_alias.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -95481,7 +95483,11 @@ let simplify_alias
     | Lvar v ->
       begin match (Ident_hashtbl.find_opt meta.alias_tbl v) with
       | None -> lam
-      | Some v -> Lam.var v 
+      | Some v ->
+        if Ident.persistent v then 
+          Lam.prim ~primitive:(Pgetglobal v) ~args:[] Location.none
+        else 
+         Lam.var v 
         (* This is wrong
             currently alias table has info 
             include -> Array
@@ -95501,21 +95507,26 @@ let simplify_alias
           since global module access is not the same as local module
           TODO: 
           since we aliased k, so it's safe to remove it?
+          no, we should not shake away code just by [Ident_set.mem k meta.export_idents ]
+          in that case, we should provide strong guarantee that all [k] will be substitued
       *)
       let v = simpl l in
-      if Ident_set.mem k meta.export_idents 
-      then 
-        Lam.let_ kind k g v
+      Lam.let_ kind k g v
         (* in this case it is preserved, but will still be simplified 
             for the inner expression
         *)
-      else v
+      
     | Lprim {primitive = (Pfield (i,_) as primitive); args =  [arg]; loc} -> 
       (* ATTENTION: 
          Main use case, we should detect inline all immutable block .. *)
-      begin match  (* simpl*)  arg with 
-      | Lvar v ->    
-        Lam_util.field_flatten_get lam
+      begin match  simpl  arg with 
+      | Lprim {primitive = Pgetglobal g; args= []} ->    
+        Lam.prim 
+          ~primitive:(Pfield(i,Lambda.Fld_na))
+          ~args:[Lam.prim ~primitive:(Pgetglobal g) ~args:[] Location.none]
+          loc
+      | Lvar v as l-> 
+        Lam_util.field_flatten_get (fun _ -> Lam.prim ~primitive ~args:[l] loc )
          v  i meta.ident_tbl 
       | _ ->  
         Lam.prim ~primitive ~args:[simpl arg] loc 
@@ -95739,6 +95750,8 @@ let simplify_alias
   in 
   simpl lam
 
+
+
 end
 module Ext_option : sig 
 #1 "ext_option.mli"

jscomp/core/lam_compile_group.ml

@@ -370,7 +370,7 @@ let lambda_as_module
   begin 
     Js_config.set_current_file filename ;  
 #if BS_DEBUG then    
-    Js_config.set_debug_file "exception_alias.ml";
+    Js_config.set_debug_file "test_include.ml";
 #end    
     let lambda_output = compile ~filename output_prefix env sigs lam in
     let (//) = Filename.concat in 

jscomp/core/lam_pass_collect.ml

@@ -90,12 +90,12 @@ let collect_helper  (meta : Lam_stats.meta) (lam : Lam.t)  =
 
     | Lprim {primitive = Pgetglobal v; args = []; _} 
       -> 
-        Lam_util.alias meta  ident v (Module  v) kind; 
+        Lam_util.alias_ident_or_global meta  ident v (Module  v) kind; 
     | Lvar v 
       -> 
         (
          (* if Ident.global v then  *)
-         Lam_util.alias meta  ident v NA kind
+         Lam_util.alias_ident_or_global meta  ident v NA kind
            (* enven for not subsitution, it still propogate some properties *)
            (* else () *)
         )

jscomp/core/lam_pass_remove_alias.ml

@@ -39,7 +39,11 @@ let simplify_alias
     | Lvar v ->
       begin match (Ident_hashtbl.find_opt meta.alias_tbl v) with
       | None -> lam
-      | Some v -> Lam.var v 
+      | Some v ->
+        if Ident.persistent v then 
+          Lam.prim ~primitive:(Pgetglobal v) ~args:[] Location.none
+        else 
+         Lam.var v 
         (* This is wrong
             currently alias table has info 
             include -> Array
@@ -59,21 +63,26 @@ let simplify_alias
           since global module access is not the same as local module
           TODO: 
           since we aliased k, so it's safe to remove it?
+          no, we should not shake away code just by [Ident_set.mem k meta.export_idents ]
+          in that case, we should provide strong guarantee that all [k] will be substitued
       *)
       let v = simpl l in
-      if Ident_set.mem k meta.export_idents 
-      then 
-        Lam.let_ kind k g v
+      Lam.let_ kind k g v
         (* in this case it is preserved, but will still be simplified 
             for the inner expression
         *)
-      else v
+      
     | Lprim {primitive = (Pfield (i,_) as primitive); args =  [arg]; loc} -> 
       (* ATTENTION: 
          Main use case, we should detect inline all immutable block .. *)
-      begin match  (* simpl*)  arg with 
-      | Lvar v ->    
-        Lam_util.field_flatten_get lam
+      begin match  simpl  arg with 
+      | Lprim {primitive = Pgetglobal g; args= []} ->    
+        Lam.prim 
+          ~primitive:(Pfield(i,Lambda.Fld_na))
+          ~args:[Lam.prim ~primitive:(Pgetglobal g) ~args:[] Location.none]
+          loc
+      | Lvar v as l-> 
+        Lam_util.field_flatten_get (fun _ -> Lam.prim ~primitive ~args:[l] loc )
          v  i meta.ident_tbl 
       | _ ->  
         Lam.prim ~primitive ~args:[simpl arg] loc 
@@ -296,3 +305,5 @@ let simplify_alias
     | Lifused (v, l) -> Lam.ifused v (simpl  l)
   in 
   simpl lam
+
+

jscomp/core/lam_pass_remove_alias.mli

@@ -46,3 +46,5 @@ val simplify_alias :
   Lam_stats.meta -> 
   Lam.t ->
   Lam.t
+
+

jscomp/core/lam_util.ml

@@ -173,7 +173,7 @@ let refine_let
   | None , _, _ -> 
     Lam.let_ Strict param arg  l
 
-let alias (meta : Lam_stats.meta) (k:Ident.t) (v:Ident.t) 
+let alias_ident_or_global (meta : Lam_stats.meta) (k:Ident.t) (v:Ident.t) 
     (v_kind : Lam_stats.kind) (let_kind : Lambda.let_kind) =
   (** treat rec as Strict, k is assigned to v 
       {[ let k = v ]}
@@ -253,13 +253,13 @@ let field_flatten_get
       ~args:[Lam.prim ~primitive:(Pgetglobal g) ~args:[] Location.none] Location.none
   | Some (ImmutableBlock (arr, _)) -> 
     begin match arr.(i) with 
-      | NA -> lam 
+      | NA -> lam ()
       | SimpleForm l -> l
     end
   | Some (Constant (Const_block (_,_,ls))) -> 
     Lam.const (List.nth  ls i)
   | Some _
-  | None -> lam 
+  | None -> lam ()
 
 
 (* TODO: check that if label belongs to a different 

jscomp/core/lam_util.mli

@@ -36,13 +36,13 @@ val string_of_primitive : Lam.primitive -> string
 val kind_of_lambda_block : Lam_stats.boxed_nullable -> Lam.t list -> Lam_stats.kind
 
 val field_flatten_get : 
-  Lam.t -> Ident.t -> int -> Lam_stats.ident_tbl -> Lam.t
+  (unit -> Lam.t) -> Ident.t -> int -> Lam_stats.ident_tbl -> Lam.t
 
 
 
 
 
-val alias : Lam_stats.meta ->
+val alias_ident_or_global : Lam_stats.meta ->
   Ident.t -> Ident.t -> Lam_stats.kind -> Lambda.let_kind -> unit 
 
 

jscomp/test/submodule.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var Curry = require("../../lib/js/curry");
 
 console.log(2);
 
@@ -58,9 +57,9 @@ var v1 = a1(1, 2);
 
 var v2 = a2(1, 2);
 
-var v3 = Curry._2(/* a3 */a3, 1, 2);
+var v3 = a3(1, 2);
 
-var v4 = Curry._2(/* A4 */A4[/* a4 */0], 1, 2);
+var v4 = a4(1, 2);
 
 var v0 = 4;
 

jscomp/test/test_include.js

@@ -26,6 +26,20 @@ var N = 0;
 
 var v = List.length;
 
+var N0 = 0;
+
+var N1 = 0;
+
+var N2 = 0;
+
+var N3 = 0;
+
+var N4 = 0;
+
+var N5 = 0;
+
+var N6 = 0;
+
 var length = List.length;
 
 var hd = List.hd;
@@ -119,6 +133,13 @@ exports.v            = v;
 exports.Make         = Make;
 exports.X            = X;
 exports.U            = U;
+exports.N0           = N0;
+exports.N1           = N1;
+exports.N2           = N2;
+exports.N3           = N3;
+exports.N4           = N4;
+exports.N5           = N5;
+exports.N6           = N6;
 exports.length       = length;
 exports.hd           = hd;
 exports.tl           = tl;

jscomp/test/test_include.ml

@@ -18,3 +18,19 @@ module U = Make(Test_order)
 include N
 
 
+(* Missing optimization
+  alias to a number could also be removed, especially 0
+*)
+
+module N0 = N 
+
+module N1 = N0
+
+module N2 = N1 
+module N3 = N2 
+module N4 = N3 
+module N5 = N4 
+module N6 = N5
+
+include N6
+