continue shrinking the size of cmj

Author: bobzhang

jscomp/core/builtin_cmi_datasets.ml

@@ -56,7 +56,7 @@ type t = {
   cmj_case : cmj_case; 
 }
 
-let mk ~(values:cmj_value Map_string.t) ~effect ~npm_package_path ~cmj_case : t = 
+let make ~(values:cmj_value Map_string.t) ~effect ~npm_package_path ~cmj_case : t = 
   {
     values = Map_string.to_sorted_array_with_f values (fun k v -> {
       name = k ; 
@@ -130,13 +130,14 @@ let to_file name ~check_exists (v : t) =
 let keyComp (a : string) b = 
     Map_string.compare_key  a b.name 
 
-let not_found = single_na, None 
+let not_found key = {name = key; arity = single_na; persistent_closed_lambda =  None }
 
-let get_result  midVal =   
-  midVal.arity,
-  if Js_config.get_cross_module_inline () then midVal.persistent_closed_lambda
-  else None 
 
+let get_result  midVal =   
+  if midVal.persistent_closed_lambda = None || 
+    Js_config.get_cross_module_inline () then midVal
+  else {midVal with persistent_closed_lambda = None}  
+  
 let rec binarySearchAux arr lo hi (key : string) = 
   let mid = (lo + hi)/2 in 
   let midVal = Array.unsafe_get arr mid in 
@@ -147,33 +148,33 @@ let rec binarySearchAux arr lo hi (key : string) =
     if hi = mid then  
       let loVal = (Array.unsafe_get arr lo) in 
       if loVal.name = key then get_result loVal
-      else not_found
+      else not_found key
     else binarySearchAux arr lo mid key 
   else  (*  a[lo] =< a[mid] < key <= a[hi] *)
   if lo = mid then 
     let hiVal = (Array.unsafe_get arr hi) in 
     if hiVal.name = key  then get_result hiVal
-    else not_found
+    else not_found key
   else binarySearchAux arr mid hi key
 
-let binarySearch (sorted : keyed_cmj_values) (key : string) =  
+let binarySearch (sorted : keyed_cmj_values) (key : string) : keyed_cmj_value =  
   let len = Array.length sorted in 
-  if len = 0 then not_found
+  if len = 0 then not_found key
   else 
     let lo = Array.unsafe_get sorted 0 in 
     let c = keyComp key lo in 
-    if c < 0 then not_found
+    if c < 0 then not_found key
     else
       let hi = Array.unsafe_get sorted (len - 1) in 
       let c2 = keyComp key hi in 
-      if c2 > 0 then not_found
+      if c2 > 0 then not_found key
       else binarySearchAux sorted 0 (len - 1) key 
 
 
 (* FIXME: better error message when ocamldep
   get self-cycle
 *)    
-let query_by_name (cmj_table : t ) name =   
+let query_by_name (cmj_table : t ) name  : keyed_cmj_value =   
   let values = cmj_table.values in    
   binarySearch values name 
 

jscomp/core/builtin_cmj_datasets.ml

@@ -69,17 +69,21 @@ type cmj_case = Ext_namespace.file_kind
 type t 
 
 
-val mk:
+val make:
   values: cmj_value Map_string.t -> 
   effect: effect -> 
   npm_package_path: Js_packages_info.t ->
   cmj_case:cmj_case -> 
   t
-
+  
+type keyed_cmj_value = 
+  { name : string ;
+     arity : arity ; 
+     persistent_closed_lambda : Lam.t option}
 val query_by_name : 
   t ->
   string -> 
-  arity * Lam.t option 
+  keyed_cmj_value
 
 val is_pure : 
   t -> bool 

jscomp/core/js_cmj_format.ml

@@ -180,7 +180,7 @@ let rec
     pos
   : Js_output.t =  
   match Lam_compile_env.query_external_id_info id pos  with      
-  | { closed_lambda = Some lam}
+  | {  persistent_closed_lambda = Some lam}
       when Lam_util.not_function lam
       ->
       compile_lambda lamba_cxt lam     
@@ -225,7 +225,7 @@ and compile_external_field_apply
   let ident_info =  
     Lam_compile_env.query_external_id_info module_id field_name  in 
   let ap_args = appinfo.ap_args in 
-  match ident_info.closed_lambda with
+  match ident_info.persistent_closed_lambda with
   | Some (Lfunction{ params; body; _})
       when Ext_list.same_length params ap_args ->
       (* TODO: serialize it when exporting to save compile time *)

jscomp/core/js_cmj_format.mli

@@ -41,10 +41,10 @@ type env_value =
 
 
 
-type ident_info = {
+type ident_info = Js_cmj_format.keyed_cmj_value = {
   name : string;
   arity : Js_cmj_format.arity; 
-  closed_lambda : Lam.t option 
+  persistent_closed_lambda : Lam.t option 
 }
 
 (*
@@ -115,16 +115,9 @@ let query_external_id_info (module_id : Ident.t) (name : string) : ident_info =
       cmj_load_info.cmj_table
     | Some (Ml { cmj_table } )
       -> cmj_table
-    | Some External  -> assert false in 
-  let arity , closed_lambda =  
-    Js_cmj_format.query_by_name cmj_table name 
-  in
-  { 
-    name; 
-    arity;
-    closed_lambda
-    (* TODO shall we cache the arity ?*) 
-  } 
+    | Some External  -> assert false in   
+  Js_cmj_format.query_by_name cmj_table name 
+
 
 
 

jscomp/core/lam_compile.ml

@@ -30,11 +30,7 @@
 
 
 
-type ident_info = {
-  name : string;
-  arity : Js_cmj_format.arity;
-  closed_lambda : Lam.t option 
-}  
+
 
 
 
@@ -81,7 +77,7 @@ val add_js_module :
 val query_external_id_info : 
   Ident.t ->
   string -> 
-  ident_info
+  Js_cmj_format.keyed_cmj_value
 
 
 val is_pure_module : Lam_module_ident.t -> bool

jscomp/core/lam_compile_env.ml

@@ -121,7 +121,7 @@ let simplify_alias
              ap_args = args; ap_loc = loc ; ap_status = status} ->
       begin
         match  Lam_compile_env.query_external_id_info ident fld_name with                   
-        | {closed_lambda=Some Lfunction{params; body; _} } 
+        | {persistent_closed_lambda=Some Lfunction{params; body; _} } 
           (** be more cautious when do cross module inlining *)
           when
             Ext_list.same_length params args &&

jscomp/core/lam_compile_env.mli

@@ -96,7 +96,13 @@ let values_of_export
            else
              None
          | None -> None  in 
-       Map_string.add  acc x.name  Js_cmj_format.{arity ; persistent_closed_lambda }
+       match arity, persistent_closed_lambda with 
+       | Single Arity_na, 
+        (None | Some (Lconst (Const_pointer (_, Pt_module_alias)))) -> acc
+       | _ ->  
+         let cmj_value : Js_cmj_format.cmj_value =  
+           {arity ; persistent_closed_lambda } in  
+         Map_string.add  acc x.name  cmj_value
     )
 
 (* ATTENTION: all runtime modules, if it is not hard required, 
@@ -136,7 +142,7 @@ let export_to_cmj
   : Js_cmj_format.t = 
   let values =  values_of_export meta export_map in
 
-  Js_cmj_format.mk
+  Js_cmj_format.make
     ~values
     ~effect 
     ~npm_package_path: (Js_packages_state.get_packages_info ())

jscomp/core/lam_pass_remove_alias.ml

@@ -28,15 +28,11 @@
 
 
 let get_files ext dir = 
-  let arr =     
-    Ext_array.filter_map (Sys.readdir dir)
-      (fun  x ->
-         if Ext_string.ends_with x  ext 
-         then Some (Filename.concat dir x) else None )
-  in
-  (* Sort to guarantee it works the same across OSes *)
-  Array.sort (fun (x : string) y -> Pervasives.compare x y ) arr;
-  Array.to_list arr
+  Ext_array.filter_map (Sys.readdir dir)
+    (fun  x ->
+       if Ext_string.ends_with x  ext 
+       then Some (Filename.concat dir x) else None )
+  |> Array.to_list
 
 (** the cache should be readable and also update *)
 
@@ -113,16 +109,26 @@ let i s = lazy (Marshal.from_string s 0)
       ;;
 
 let stdlib = "stdlib-406"
+let (//) = Filename.concat 
+let (|~) = Ext_string.contain_substring
 
 let () = 
-  from_cmj ( 
-    Filename.concat "runtime" "js.cmj" ::
-    get_files Literals.suffix_cmj stdlib @             
-    get_files Literals.suffix_cmj "others")
+  let cmj_files = 
+    ( 
+       "runtime" // "js.cmj" ::
+      get_files Literals.suffix_cmj stdlib @             
+      get_files Literals.suffix_cmj "others") in 
+  from_cmj cmj_files
     (Filename.concat "core" "builtin_cmj_datasets.ml");
-  from_cmi ( 
-    Filename.concat "runtime"  "js.cmi" ::
-    get_files Literals.suffix_cmi stdlib @
-    get_files Literals.suffix_cmi "others")
+  let cmi_files = 
+    "runtime" // "js.cmi" ::       
+    (get_files Literals.suffix_cmi stdlib @
+    get_files Literals.suffix_cmi "others" )
+    |> List.filter (fun x -> 
+       x|~ "js_internalOO" ||
+       x|~  "camlinternal" ||
+       not (x |~ "internal"))
+  in     
+  from_cmi cmi_files
     (Filename.concat "core" "builtin_cmi_datasets.ml")