code split

Author: bobzhang

jscomp/core/js_pass_get_used.ml

@@ -0,0 +1,80 @@
+(* Copyright (C) 2020- Authors of BuckleScript
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+
+(** Update ident info use cases, it is a non pure function, 
+    it will annotate [program] with some meta data
+    TODO: Ident Hash could be improved, 
+    since in this case it can not be global?  
+
+*)
+let count_collects () = 
+  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)
+      =  
+      Hash_ident.add defined_idents ident v; 
+      match value with 
+      | None -> 
+        self
+      | Some x
+        -> self#expression x 
+    method! ident id = self#add_use id; self
+    method get_stats = 
+      Hash_ident.iter defined_idents (fun ident v  -> 
+          if Set_ident.mem my_export_set ident then 
+            Js_op_util.update_used_stats v.ident_info Exported
+          else 
+            let pure = 
+              match v.value  with 
+              | None -> false  (* can not happen *)
+              | Some x -> Js_analyzer.no_side_effect_expression x in
+            match Hash_ident.find_opt stats ident with 
+            | None -> 
+              Js_op_util.update_used_stats v.ident_info 
+                (if pure then Dead_pure else Dead_non_pure)
+            | Some num -> 
+              if num = 1 then 
+                Js_op_util.update_used_stats v.ident_info 
+                  (if pure then Once_pure else Used) 
+        ) ; defined_idents
+  end
+
+
+let get_stats (program : J.program) : J.variable_declaration Hash_ident.t
+  =  ((count_collects ()) #program program) #get_stats
+ 

jscomp/core/js_pass_get_used.mli

@@ -0,0 +1,28 @@
+(* Copyright (C) 2020- Authors of BuckleScript
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+
+
+ val get_stats:
+  J.program -> J.variable_declaration Hash_ident.t

jscomp/core/js_pass_tailcall_inline.ml

@@ -41,62 +41,6 @@ module S = Js_stmt_make
 (* module E = Js_exp_make *)
 
 
-(** Update ident info use cases, it is a non pure function, 
-    it will annotate [program] with some meta data
-    TODO: Ident Hash could be improved, 
-    since in this case it can not be global?  
-
-*)
-let count_collects () = 
-  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)
-      =  
-      Hash_ident.add defined_idents ident v; 
-      match value with 
-      | None -> 
-        self
-      | Some x
-        -> self#expression x 
-    method! ident id = self#add_use id; self
-    method get_stats = 
-      Hash_ident.iter defined_idents (fun ident v  -> 
-          if Set_ident.mem my_export_set ident then 
-            Js_op_util.update_used_stats v.ident_info Exported
-          else 
-            let pure = 
-              match v.value  with 
-              | None -> false  (* can not happen *)
-              | Some x -> Js_analyzer.no_side_effect_expression x in
-            match Hash_ident.find_opt stats ident with 
-            | None -> 
-              Js_op_util.update_used_stats v.ident_info 
-                (if pure then Dead_pure else Dead_non_pure)
-            | Some num -> 
-              if num = 1 then 
-                Js_op_util.update_used_stats v.ident_info 
-                  (if pure then Once_pure else Used) 
-        ) ; defined_idents
-  end
-
-
-let get_stats (program : J.program) : J.variable_declaration Hash_ident.t
-  =  ((count_collects ()) #program program) #get_stats
 
 
 (* 1. recursive value ? let rec x = 1 :: x
@@ -227,7 +171,7 @@ let subst (export_set : Set_ident.t) stats  =
 
 
 let tailcall_inline (program : J.program) = 
-  let stats = get_stats program in
+  let stats = Js_pass_get_used.get_stats program in
   let export_set = program.export_set in
   (subst export_set stats )#program program
 

lib/4.06.1/unstable/js_compiler.ml

@@ -392894,9 +392894,9 @@ let program js =
   (scope_pass # program js ) # get_loop_mutable_values
 
 end
-module Js_pass_tailcall_inline : sig 
-#1 "js_pass_tailcall_inline.mli"
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+module Js_pass_get_used : sig 
+#1 "js_pass_get_used.mli"
+(* Copyright (C) 2020- Authors of BuckleScript
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -392922,29 +392922,11 @@ module Js_pass_tailcall_inline : sig
 
 
 
-
-
-
-
-
-(** This pass detect functions used once and if it is used in used
-    in the tail position, it will get inlined, this will help 
-    remove some common use cases like This
-    {[
-      let length x = 
-        let rec aux n x = 
-          match x with 
-          | [] -> n 
-          | _ :: rest -> aux (n + 1) rest in
-        aux 0 x         
-    ]} 
-*)
-
-val tailcall_inline : J.program -> J.program 
-
+ val get_stats:
+  J.program -> J.variable_declaration Hash_ident.t
 end = struct
-#1 "js_pass_tailcall_inline.ml"
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+#1 "js_pass_get_used.ml"
+(* Copyright (C) 2020- Authors of BuckleScript
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -392969,24 +392951,6 @@ end = struct
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-
-
-
-
-(* When we inline a function call, if we don't do a beta-reduction immediately, there is 
-   a chance that it is ignored, (we can not assume that each pass is robust enough)
-
-   After we do inlining, it makes sense to do another constant folding and propogation 
- *)
-
-(* Check: shall we inline functions with while loop? if it is used only once, 
-   it makes sense to inline it
-*)
-
-module S = Js_stmt_make
-(* module E = Js_exp_make *)
-
-
 (** Update ident info use cases, it is a non pure function, 
     it will annotate [program] with some meta data
     TODO: Ident Hash could be improved, 
@@ -393003,12 +392967,10 @@ let count_collects () =
 
     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)
@@ -393043,6 +393005,101 @@ let count_collects () =
 
 let get_stats (program : J.program) : J.variable_declaration Hash_ident.t
   =  ((count_collects ()) #program program) #get_stats
+ 
+end
+module Js_pass_tailcall_inline : sig 
+#1 "js_pass_tailcall_inline.mli"
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+
+
+
+
+
+
+
+(** This pass detect functions used once and if it is used in used
+    in the tail position, it will get inlined, this will help 
+    remove some common use cases like This
+    {[
+      let length x = 
+        let rec aux n x = 
+          match x with 
+          | [] -> n 
+          | _ :: rest -> aux (n + 1) rest in
+        aux 0 x         
+    ]} 
+*)
+
+val tailcall_inline : J.program -> J.program 
+
+end = struct
+#1 "js_pass_tailcall_inline.ml"
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+
+
+
+
+
+(* When we inline a function call, if we don't do a beta-reduction immediately, there is 
+   a chance that it is ignored, (we can not assume that each pass is robust enough)
+
+   After we do inlining, it makes sense to do another constant folding and propogation 
+ *)
+
+(* Check: shall we inline functions with while loop? if it is used only once, 
+   it makes sense to inline it
+*)
+
+module S = Js_stmt_make
+(* module E = Js_exp_make *)
+
+
 
 
 (* 1. recursive value ? let rec x = 1 :: x
@@ -393173,7 +393230,7 @@ let subst (export_set : Set_ident.t) stats  =
 
 
 let tailcall_inline (program : J.program) = 
-  let stats = get_stats program in
+  let stats = Js_pass_get_used.get_stats program in
   let export_set = program.export_set in
   (subst export_set stats )#program program