pass along is_functor info

Author: bobzhang

jscomp/core/lam.ml

@@ -35,12 +35,19 @@ type inline_attribute =
   | Never_inline
   | Default_inline
 
+type is_a_functor = 
+  | Functor_yes
+  | Functor_no 
+  | Functor_na  
+
 type function_attribute = {
-  inline : inline_attribute
+  inline : inline_attribute;
+  is_a_functor : is_a_functor
 }  
 
 let default_fn_attr : function_attribute = {
-  inline = Default_inline
+  inline = Default_inline;
+  is_a_functor = Functor_na
 }
 module Types = struct
 

jscomp/core/lam.mli

@@ -29,8 +29,14 @@ type inline_attribute =
   | Never_inline
   | Default_inline  
 
+type is_a_functor = 
+  | Functor_yes
+  | Functor_no 
+  | Functor_na  
+
 type function_attribute = {
-  inline : inline_attribute
+  inline : inline_attribute;
+  is_a_functor : is_a_functor
 }  
 
 val default_fn_attr : function_attribute

jscomp/core/lam_convert.ml

@@ -447,7 +447,9 @@ let convert_fn_attribute (attr : Lambda.function_attribute) : Lam.function_attri
     | Never_inline -> Never_inline
     | Unroll _
     | Default_inline -> Default_inline in 
-  Lam.{inline}
+  let is_a_functor =
+    if attr.is_a_functor then Lam.Functor_yes else Functor_no in     
+  Lam.{inline; is_a_functor}
 
 
 

jscomp/core/lam_inline_util.ml

@@ -38,8 +38,7 @@ let maybe_functor (name : string) =
   name.[0] >= 'A' && name.[0] <= 'Z'
 
 
-let should_be_functor (name : string) (lam : Lam.t) = 
-  maybe_functor name  &&
-  (match lam with Lfunction _ -> true | _ -> false)
+let should_be_functor (lam : Lam.t) =   
+  (match lam with Lfunction {attr = {is_a_functor = Functor_yes}} -> true | _ -> false)
 
 

jscomp/core/lam_inline_util.mli

@@ -33,4 +33,4 @@
 
 val maybe_functor : string -> bool
 
-val should_be_functor : string -> Lam.t -> bool 
+val should_be_functor :  Lam.t -> bool 

jscomp/core/lam_stats_export.ml

@@ -74,7 +74,7 @@ let values_of_export
               only truly immutable values can be inlined
            *)
            then
-             if Lam_inline_util.should_be_functor x.name lambda (* can also be submodule *)
+             if Lam_inline_util.should_be_functor lambda (* can also be submodule *)
              then
                if Lam_closure.is_closed lambda (* TODO: seriealize more*)
                then Some lambda