clean up object usage

Author: bobzhang

jscomp/core/js_pass_get_used.ml

@@ -29,21 +29,16 @@
     since in this case it can not be global?  
 
 *)
-let count_collects () = 
+let count_collects my_export_set = 
   object (self)
-    inherit Js_fold.fold as super
+    inherit Js_fold.fold 
     (* collect used status*)
     val stats : int Hash_ident.t = Hash_ident.create 83
     (* collect all def sites *)
     val defined_idents : J.variable_declaration Hash_ident.t = Hash_ident.create 83
 
-    val mutable my_export_set  : Set_ident.t = Set_ident.empty
-
     method add_use id = 
       Hash_ident.add_or_update stats id 1 ~update:succ 
-    method! program x = 
-      my_export_set <- x.export_set ; 
-      super#program x
     method! variable_declaration 
         ({ident; value ; property = _ ; ident_info = _}  as v)
       =  
@@ -76,5 +71,5 @@ let count_collects () =
 
 
 let get_stats (program : J.program) : J.variable_declaration Hash_ident.t
-  =  ((count_collects ()) #program program) #get_stats
+  =  ((count_collects program.export_set) #program program) #get_stats
 

lib/4.06.1/unstable/js_compiler.ml

@@ -102602,21 +102602,16 @@ end = struct
     since in this case it can not be global?  
 
 *)
-let count_collects () = 
+let count_collects my_export_set = 
   object (self)
-    inherit Js_fold.fold as super
+    inherit Js_fold.fold 
     (* collect used status*)
     val stats : int Hash_ident.t = Hash_ident.create 83
     (* collect all def sites *)
     val defined_idents : J.variable_declaration Hash_ident.t = Hash_ident.create 83
 
-    val mutable my_export_set  : Set_ident.t = Set_ident.empty
-
     method add_use id = 
       Hash_ident.add_or_update stats id 1 ~update:succ 
-    method! program x = 
-      my_export_set <- x.export_set ; 
-      super#program x
     method! variable_declaration 
         ({ident; value ; property = _ ; ident_info = _}  as v)
       =  
@@ -102649,7 +102644,7 @@ let count_collects () =
 
 
 let get_stats (program : J.program) : J.variable_declaration Hash_ident.t
-  =  ((count_collects ()) #program program) #get_stats
+  =  ((count_collects program.export_set) #program program) #get_stats
 
 end
 module Js_pass_tailcall_inline : sig 

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -102602,21 +102602,16 @@ end = struct
     since in this case it can not be global?  
 
 *)
-let count_collects () = 
+let count_collects my_export_set = 
   object (self)
     inherit Js_fold.fold as super
     (* collect used status*)
     val stats : int Hash_ident.t = Hash_ident.create 83
     (* collect all def sites *)
     val defined_idents : J.variable_declaration Hash_ident.t = Hash_ident.create 83
 
-    val mutable my_export_set  : Set_ident.t = Set_ident.empty
-
     method add_use id = 
       Hash_ident.add_or_update stats id 1 ~update:succ 
-    method! program x = 
-      my_export_set <- x.export_set ; 
-      super#program x
     method! variable_declaration 
         ({ident; value ; property = _ ; ident_info = _}  as v)
       =  
@@ -102649,7 +102644,7 @@ let count_collects () =
 
 
 let get_stats (program : J.program) : J.variable_declaration Hash_ident.t
-  =  ((count_collects ()) #program program) #get_stats
+  =  ((count_collects program.export_set) #program program) #get_stats
 
 end
 module Js_pass_tailcall_inline : sig 

lib/4.06.1/whole_compiler.ml

@@ -385084,21 +385084,16 @@ end = struct
     since in this case it can not be global?  
 
 *)
-let count_collects () = 
+let count_collects my_export_set = 
   object (self)
-    inherit Js_fold.fold as super
+    inherit Js_fold.fold 
     (* collect used status*)
     val stats : int Hash_ident.t = Hash_ident.create 83
     (* collect all def sites *)
     val defined_idents : J.variable_declaration Hash_ident.t = Hash_ident.create 83
 
-    val mutable my_export_set  : Set_ident.t = Set_ident.empty
-
     method add_use id = 
       Hash_ident.add_or_update stats id 1 ~update:succ 
-    method! program x = 
-      my_export_set <- x.export_set ; 
-      super#program x
     method! variable_declaration 
         ({ident; value ; property = _ ; ident_info = _}  as v)
       =  
@@ -385131,7 +385126,7 @@ let count_collects () =
 
 
 let get_stats (program : J.program) : J.variable_declaration Hash_ident.t
-  =  ((count_collects ()) #program program) #get_stats
+  =  ((count_collects program.export_set) #program program) #get_stats
 
 end
 module Js_pass_tailcall_inline : sig