take into account inline attribute when deciding whether inline or no

Author: bobzhang

jscomp/core/lam_analysis.ml

@@ -334,14 +334,18 @@ let destruct_pattern (body : Lam.t) params args =
 
 (** Hints to inlining *)
 let ok_to_inline_fun_when_app 
-  ~(body : Lam.t) 
-  (params : Ident.t list)
+  (m : Lam.lfunction)
   (args : Lam.t list) =
-  let s = size body in
-  s < small_inline_size ||
-  (destruct_pattern body params args) ||  
-  (args_all_const args &&
-   (s < 10 && no_side_effects body )) 
+  match m.attr with
+  | Always_inline -> true
+  | Never_inline -> false
+  | Default_inline ->
+    let Lam.{body; params} = m in 
+    let s = size body in
+    s < small_inline_size ||
+    (destruct_pattern body params args) ||  
+    (args_all_const args &&
+     (s < 10 && no_side_effects body )) 
 
 
 

jscomp/core/lam_analysis.mli

@@ -34,7 +34,10 @@ val no_side_effects : Lam.t -> bool
 
 val size : Lam.t -> int
 
-val ok_to_inline_fun_when_app : body:Lam.t -> Lam.ident list -> Lam.t list -> bool
+val ok_to_inline_fun_when_app :
+   Lam.lfunction -> 
+   Lam.t list -> 
+   bool
 
 
 

jscomp/core/lam_pass_remove_alias.ml

@@ -155,7 +155,7 @@ let simplify_alias
       let normal () = Lam.apply ( simpl fn) (Ext_list.map args simpl) loc status in
       begin 
         match Hash_ident.find_opt meta.ident_tbl v with
-        | Some (FunctionId {lambda = Some(Lfunction {params; body} as _m,
+        | Some (FunctionId {lambda = Some(Lfunction ({params; body} as m),
                                           rec_flag)
                            })
           -> 
@@ -177,7 +177,7 @@ let simplify_alias
               end
             else 
             if (* Lam_analysis.size body < Lam_analysis.small_inline_size *)
-              Lam_analysis.ok_to_inline_fun_when_app ~body params args 
+              Lam_analysis.ok_to_inline_fun_when_app m args 
             then 
 
               (* let param_map =  *)