avoid functional objects in free_variables

Author: bobzhang

jscomp/core/js_analyzer.ml

@@ -29,7 +29,13 @@
 
 
 
+type idents_stats = {
+  mutable used_idents : Set_ident.t ;
+  mutable defined_idents : Set_ident.t;
+} 
 
+let add_defined_idents (x : idents_stats) ident = 
+  x.defined_idents <- Set_ident.add x.defined_idents ident 
 
 (* Assume that functions already calculated closure correctly 
    Maybe in the future, we should add a dirty flag, to mark the calcuated 
@@ -38,45 +44,48 @@
    Note such shaking is done in the toplevel, so that it requires us to 
    flatten the statement first 
 *)
-let free_variables used_idents defined_idents = 
+let free_variables (stats : idents_stats) : Js_fold.fold = 
   object (self)
     inherit Js_fold.fold as super
-    val defined_idents = defined_idents
-    val used_idents = used_idents 
-    method get_depenencies = 
-      Set_ident.diff used_idents defined_idents
     method! variable_declaration st = 
-      match st with 
-      | { ident; value = None}
+      add_defined_idents stats st.ident; 
+      match st.value with 
+      |  None
+        ->  self
+      | Some v
         -> 
-        {< defined_idents = Set_ident.add defined_idents ident >}
-      | { ident; value = Some v}
-        -> 
-        {< defined_idents = Set_ident.add defined_idents ident >} # expression v
+        self # expression v
     method! ident id = 
-      if Set_ident.mem defined_idents id then self
-      else {<used_idents = Set_ident.add used_idents id>}
+      (if not (Set_ident.mem stats.defined_idents id )then 
+         stats.used_idents <- Set_ident.add stats.used_idents id); 
+      self
     method! expression exp = 
-
       match exp.expression_desc with
       | Fun(_, _,_, env)
         (** a optimization to avoid walking into funciton again
             if it's already comuted
         *)
         ->
-        {< used_idents = 
-             Set_ident.union (Js_fun_env.get_unbounded env) used_idents  >}
+        stats.used_idents <-
+          Set_ident.union (Js_fun_env.get_unbounded env) stats.used_idents;
+        self 
 
       | _
         ->
         super#expression exp
   end 
 
-let free_variables_of_statement used_idents defined_idents st = 
-  ((free_variables used_idents defined_idents)#statement st) # get_depenencies
+let free_variables_of_statement  st = 
+  let init = {used_idents = Set_ident.empty;  
+              defined_idents = Set_ident.empty} in 
+  let _ = (free_variables init)#statement st in 
+  Set_ident.diff init.used_idents init.defined_idents
 
-let free_variables_of_expression used_idents defined_idents st = 
-  ((free_variables used_idents defined_idents)#expression st) # get_depenencies
+let free_variables_of_expression  st = 
+  let init = {used_idents = Set_ident.empty;  
+              defined_idents = Set_ident.empty} in 
+  let _ = (free_variables init)#expression st in 
+  Set_ident.diff init.used_idents init.defined_idents
 
 let rec no_side_effect_expression_desc (x : J.expression_desc)  = 
   match x with 

jscomp/core/js_analyzer.mli

@@ -35,10 +35,10 @@
 *)
 
 val free_variables_of_statement : 
-  Set_ident.t -> Set_ident.t -> J.statement -> Set_ident.t
+  J.statement -> Set_ident.t
 
 val free_variables_of_expression : 
-  Set_ident.t -> Set_ident.t -> J.finish_ident_expression -> Set_ident.t
+  J.finish_ident_expression -> Set_ident.t
 
 (* val no_side_effect_expression_desc :
   J.expression_desc -> bool    *)

jscomp/core/js_shake.ml

@@ -46,7 +46,7 @@ let get_initial_exports
                   TODO: add hashtbl for a cache
                *)
                 Set_ident.(
-                union (Js_analyzer.free_variables_of_expression empty empty x) acc)
+                union (Js_analyzer.free_variables_of_expression  x) acc)
             end
           else 
             begin match value with
@@ -55,14 +55,14 @@ let get_initial_exports
                 if Js_analyzer.no_side_effect_expression x then acc 
                 else 
                   Set_ident.(
-                  union (Js_analyzer.free_variables_of_expression empty empty x) 
+                  union (Js_analyzer.free_variables_of_expression x) 
                     (add acc ident))
             end
       | _ -> 
           (* recalcuate again and again ... *)
           if Js_analyzer.no_side_effect_statement st || (not count_non_variable_declaration_statement)
           then acc
-          else Set_ident.(union (Js_analyzer.free_variables_of_statement empty empty st) acc)
+          else Set_ident.(union (Js_analyzer.free_variables_of_statement  st) acc)
     ) in result, Set_ident.(diff result export_set)
 
 let shake_program (program : J.program) = 

lib/4.06.1/unstable/js_compiler.ml

@@ -86983,10 +86983,10 @@ module Js_analyzer : sig
 *)
 
 val free_variables_of_statement : 
-  Set_ident.t -> Set_ident.t -> J.statement -> Set_ident.t
+  J.statement -> Set_ident.t
 
 val free_variables_of_expression : 
-  Set_ident.t -> Set_ident.t -> J.finish_ident_expression -> Set_ident.t
+  J.finish_ident_expression -> Set_ident.t
 
 (* val no_side_effect_expression_desc :
   J.expression_desc -> bool    *)
@@ -87068,7 +87068,13 @@ end = struct
 
 
 
+type idents_stats = {
+  mutable used_idents : Set_ident.t ;
+  mutable defined_idents : Set_ident.t;
+} 
 
+let add_defined_idents (x : idents_stats) ident = 
+  x.defined_idents <- Set_ident.add x.defined_idents ident 
 
 (* Assume that functions already calculated closure correctly 
    Maybe in the future, we should add a dirty flag, to mark the calcuated 
@@ -87077,24 +87083,21 @@ end = struct
    Note such shaking is done in the toplevel, so that it requires us to 
    flatten the statement first 
 *)
-let free_variables used_idents defined_idents = 
+let free_variables (stats : idents_stats) : Js_fold.fold = 
   object (self)
     inherit Js_fold.fold as super
-    val defined_idents = defined_idents
-    val used_idents = used_idents 
-    method get_depenencies = 
-      Set_ident.diff used_idents defined_idents
     method! variable_declaration st = 
-      match st with 
-      | { ident; value = None}
-        -> 
-        {< defined_idents = Set_ident.add defined_idents ident >}
-      | { ident; value = Some v}
+      add_defined_idents stats st.ident; 
+      match st.value with 
+      |  None
+        ->  self
+      | Some v
         -> 
-        {< defined_idents = Set_ident.add defined_idents ident >} # expression v
+        self # expression v
     method! ident id = 
-      if Set_ident.mem defined_idents id then self
-      else {<used_idents = Set_ident.add used_idents id>}
+      (if not (Set_ident.mem stats.defined_idents id )then 
+         stats.used_idents <- Set_ident.add stats.used_idents id); 
+      self
     method! expression exp = 
 
       match exp.expression_desc with
@@ -87103,19 +87106,26 @@ let free_variables used_idents defined_idents =
             if it's already comuted
         *)
         ->
-        {< used_idents = 
-             Set_ident.union (Js_fun_env.get_unbounded env) used_idents  >}
+        stats.used_idents <-
+          Set_ident.union (Js_fun_env.get_unbounded env) stats.used_idents;
+        self 
 
       | _
         ->
         super#expression exp
   end 
 
-let free_variables_of_statement used_idents defined_idents st = 
-  ((free_variables used_idents defined_idents)#statement st) # get_depenencies
+let free_variables_of_statement  st = 
+  let init = {used_idents = Set_ident.empty;  
+              defined_idents = Set_ident.empty} in 
+  let _ = (free_variables init)#statement st in 
+  Set_ident.diff init.used_idents init.defined_idents
 
-let free_variables_of_expression used_idents defined_idents st = 
-  ((free_variables used_idents defined_idents)#expression st) # get_depenencies
+let free_variables_of_expression  st = 
+  let init = {used_idents = Set_ident.empty;  
+              defined_idents = Set_ident.empty} in 
+  let _ = (free_variables init)#expression st in 
+  Set_ident.diff init.used_idents init.defined_idents
 
 let rec no_side_effect_expression_desc (x : J.expression_desc)  = 
   match x with 
@@ -103015,7 +103025,7 @@ let get_initial_exports
                   TODO: add hashtbl for a cache
                *)
                 Set_ident.(
-                union (Js_analyzer.free_variables_of_expression empty empty x) acc)
+                union (Js_analyzer.free_variables_of_expression  x) acc)
             end
           else 
             begin match value with
@@ -103024,14 +103034,14 @@ let get_initial_exports
                 if Js_analyzer.no_side_effect_expression x then acc 
                 else 
                   Set_ident.(
-                  union (Js_analyzer.free_variables_of_expression empty empty x) 
+                  union (Js_analyzer.free_variables_of_expression x) 
                     (add acc ident))
             end
       | _ -> 
           (* recalcuate again and again ... *)
           if Js_analyzer.no_side_effect_statement st || (not count_non_variable_declaration_statement)
           then acc
-          else Set_ident.(union (Js_analyzer.free_variables_of_statement empty empty st) acc)
+          else Set_ident.(union (Js_analyzer.free_variables_of_statement  st) acc)
     ) in result, Set_ident.(diff result export_set)
 
 let shake_program (program : J.program) = 

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -86983,10 +86983,10 @@ module Js_analyzer : sig
 *)
 
 val free_variables_of_statement : 
-  Set_ident.t -> Set_ident.t -> J.statement -> Set_ident.t
+  J.statement -> Set_ident.t
 
 val free_variables_of_expression : 
-  Set_ident.t -> Set_ident.t -> J.finish_ident_expression -> Set_ident.t
+  J.finish_ident_expression -> Set_ident.t
 
 (* val no_side_effect_expression_desc :
   J.expression_desc -> bool    *)
@@ -87068,7 +87068,13 @@ end = struct
 
 
 
+type idents_stats = {
+  mutable used_idents : Set_ident.t ;
+  mutable defined_idents : Set_ident.t;
+} 
 
+let add_defined_idents (x : idents_stats) ident = 
+  x.defined_idents <- Set_ident.add x.defined_idents ident 
 
 (* Assume that functions already calculated closure correctly 
    Maybe in the future, we should add a dirty flag, to mark the calcuated 
@@ -87077,24 +87083,21 @@ end = struct
    Note such shaking is done in the toplevel, so that it requires us to 
    flatten the statement first 
 *)
-let free_variables used_idents defined_idents = 
+let free_variables (stats : idents_stats) : Js_fold.fold = 
   object (self)
     inherit Js_fold.fold as super
-    val defined_idents = defined_idents
-    val used_idents = used_idents 
-    method get_depenencies = 
-      Set_ident.diff used_idents defined_idents
     method! variable_declaration st = 
-      match st with 
-      | { ident; value = None}
-        -> 
-        {< defined_idents = Set_ident.add defined_idents ident >}
-      | { ident; value = Some v}
+      add_defined_idents stats st.ident; 
+      match st.value with 
+      |  None
+        ->  self
+      | Some v
         -> 
-        {< defined_idents = Set_ident.add defined_idents ident >} # expression v
+        self # expression v
     method! ident id = 
-      if Set_ident.mem defined_idents id then self
-      else {<used_idents = Set_ident.add used_idents id>}
+      (if not (Set_ident.mem stats.defined_idents id )then 
+         stats.used_idents <- Set_ident.add stats.used_idents id); 
+      self
     method! expression exp = 
 
       match exp.expression_desc with
@@ -87103,19 +87106,26 @@ let free_variables used_idents defined_idents =
             if it's already comuted
         *)
         ->
-        {< used_idents = 
-             Set_ident.union (Js_fun_env.get_unbounded env) used_idents  >}
+        stats.used_idents <-
+          Set_ident.union (Js_fun_env.get_unbounded env) stats.used_idents;
+        self 
 
       | _
         ->
         super#expression exp
   end 
 
-let free_variables_of_statement used_idents defined_idents st = 
-  ((free_variables used_idents defined_idents)#statement st) # get_depenencies
+let free_variables_of_statement  st = 
+  let init = {used_idents = Set_ident.empty;  
+              defined_idents = Set_ident.empty} in 
+  let _ = (free_variables init)#statement st in 
+  Set_ident.diff init.used_idents init.defined_idents
 
-let free_variables_of_expression used_idents defined_idents st = 
-  ((free_variables used_idents defined_idents)#expression st) # get_depenencies
+let free_variables_of_expression  st = 
+  let init = {used_idents = Set_ident.empty;  
+              defined_idents = Set_ident.empty} in 
+  let _ = (free_variables init)#expression st in 
+  Set_ident.diff init.used_idents init.defined_idents
 
 let rec no_side_effect_expression_desc (x : J.expression_desc)  = 
   match x with 
@@ -87190,11 +87200,6 @@ let no_side_effect clean : Js_fold.fold =
       (if !clean then 
         clean := no_side_effect_expression s); 
       self 
-
-
-        
-         (* {< no_side_effect = no_side_effect_expression s >} *)
-
     (** only expression would cause side effec *)
   end
 let no_side_effect_statement st = 
@@ -103020,7 +103025,7 @@ let get_initial_exports
                   TODO: add hashtbl for a cache
                *)
                 Set_ident.(
-                union (Js_analyzer.free_variables_of_expression empty empty x) acc)
+                union (Js_analyzer.free_variables_of_expression  x) acc)
             end
           else 
             begin match value with
@@ -103029,14 +103034,14 @@ let get_initial_exports
                 if Js_analyzer.no_side_effect_expression x then acc 
                 else 
                   Set_ident.(
-                  union (Js_analyzer.free_variables_of_expression empty empty x) 
+                  union (Js_analyzer.free_variables_of_expression x) 
                     (add acc ident))
             end
       | _ -> 
           (* recalcuate again and again ... *)
           if Js_analyzer.no_side_effect_statement st || (not count_non_variable_declaration_statement)
           then acc
-          else Set_ident.(union (Js_analyzer.free_variables_of_statement empty empty st) acc)
+          else Set_ident.(union (Js_analyzer.free_variables_of_statement  st) acc)
     ) in result, Set_ident.(diff result export_set)
 
 let shake_program (program : J.program) =