refine recursive function information

Author: bobzhang

jscomp/core/lam_analysis.ml

@@ -377,7 +377,10 @@ let destruct_pattern (body : Lam.t) params args =
   | _ -> false
 
 (** Hints to inlining *)
-let ok_to_inline_fun_when_app ~body params args =
+let ok_to_inline_fun_when_app 
+  ~(body : Lam.t) 
+  (params : Ident.t list)
+  (args : Lam.t list) =
   let s = size body in
   s < small_inline_size ||
   (destruct_pattern body params args) ||  

jscomp/core/lam_coercion.ml

@@ -144,7 +144,7 @@ let handle_exports (meta : Lam_stats.t)
                 (FunctionId{arity ; lambda = 
                 match lam with 
                 | Lfunction _ -> 
-                  Some (lam,  Non_rec)
+                  Some (lam,  Lam_non_rec)
                 | _ -> None })
               );
             { acc with

jscomp/core/lam_id_kind.ml

@@ -28,8 +28,13 @@
 
 
 type rec_flag = 
-  | Rec 
-  | Non_rec
+  | Lam_rec 
+  | Lam_non_rec
+  | Lam_self_rec 
+    (* only a 
+      single mutual 
+      recursive function      
+    *)
 
 
 type function_id = {

jscomp/core/lam_id_kind.mli

@@ -24,12 +24,14 @@
 
 
 type rec_flag = 
-  | Rec 
-  | Non_rec
+  | Lam_rec 
+  | Lam_non_rec
 
 (* TODO: This may contain some closure environment,
      check how it will interact with dead code elimination
 *)  
+  | Lam_self_rec
+  (* not inlining in this case *)
 type function_id = {
   mutable arity : Lam_arity.t;
   lambda  : (Lam.t * rec_flag) option ;

jscomp/core/lam_pass_collect.ml

@@ -143,9 +143,13 @@ let collect_helper  (meta : Lam_stats.t) (lam : Lam.t)  =
       List.iter (fun p -> Ident_hashtbl.add meta.ident_tbl p Parameter ) params;
       collect  l
     | Llet (kind,ident,arg,body) -> 
-      collect_bind Non_rec kind ident arg ; collect body
+      collect_bind Lam_non_rec kind ident arg ; collect body
     | Lletrec (bindings, body) -> 
-      List.iter (fun (ident,arg) -> collect_bind Rec  Strict ident arg ) bindings;
+      (match bindings with 
+       | [ident, arg] -> collect_bind Lam_self_rec Strict ident arg
+       | _ -> 
+         Ext_list.iter bindings
+           (fun (ident,arg) -> collect_bind Lam_rec  Strict ident arg )) ;
       collect body
     | Lglobal_module _ -> ()
     | Lprim {args; _} -> List.iter collect  args

jscomp/core/lam_pass_remove_alias.ml

@@ -234,10 +234,14 @@ let simplify_alias
               match is_export_id, param_map with 
               | false, (_, param_map)
               | true, (true, param_map) -> 
-                if rec_flag = Rec then               
-                  Lam_beta_reduce.propogate_beta_reduce_with_map meta param_map params body args
-                else 
-                  simpl (Lam_beta_reduce.propogate_beta_reduce_with_map meta param_map params body args)
+                begin match rec_flag with 
+                  | Lam_self_rec
+                  | Lam_rec  ->  Lam_beta_reduce.propogate_beta_reduce_with_map meta param_map params body args
+
+                  | Lam_non_rec -> 
+                    simpl 
+                      (Lam_beta_reduce.propogate_beta_reduce_with_map meta param_map params body args)
+                end
               | _ -> normal ()
             else 
               normal ()