Merge pull request #4182 from BuckleScript/refactor

various tricks to reduce the cost of loading large data upfront

Author: bobzhang

.gitignore

@@ -140,4 +140,5 @@ native/
 vendor/ocaml
 jscomp/.lsp
 .vscode/launch.json
-tracing*.json
+tracing*.json
+darwin/bsc

.vscode/tasks.json

@@ -52,13 +52,31 @@
             }
     },
     {
-        "label": "check unused",
+        "label": "check unused bsc",
         "command" : "node",
         "options": {
             "cwd": "${workspaceRoot}/lib"
         },
         "args": [
-            "../scripts/checkUnused.js" 
+            "../scripts/checkUnused.js",
+            "whole_compiler" 
+        ],
+        "problemMatcher" :{
+            "base": "$ocamlc",
+            "fileLocation" :
+                "autoDetect",
+                "owner": "globalUnused"     
+        }                
+    },
+    {
+        "label": "check unused bsb_helper",
+        "command" : "node",
+        "options": {
+            "cwd": "${workspaceRoot}/lib"
+        },
+        "args": [
+            "../scripts/checkUnused.js" ,
+            "bsb_helper"
         ],
         "problemMatcher" :{
             "base": "$ocamlc",

jscomp/bsb/bsb_parse_sources.ml

@@ -238,11 +238,11 @@ let prune_staled_bs_js_files
                  let lazy cmd =  bs_cmt_post_process_cmd in 
 
                  if cmd <> "" then
-                   Ext_pervasives.try_it (fun _ -> 
+                   (try ignore (
                        Sys.command (
                          cmd ^ 
                          " -cmt-rm " ^ filepath)                   
-                     )
+                     : int ) with _ -> ())
                 | Cmj _ ->        
                   (* remove .bs.js *)
                   if context.bs_suffix then
@@ -492,13 +492,13 @@ let clean_re_js root =
       | None -> Set_string.empty
     in  
     Ext_option.iter (Map_string.find_opt map Bsb_build_schemas.sources) begin fun config -> 
-      Ext_pervasives.try_it (fun () -> 
+      try (
           walk_sources { root ;                           
                          traverse = true; 
                          cwd = Filename.current_dir_name;
                          ignored_dirs
                          } config
-        )      
+        ) with _ -> ()      
     end
   | _  -> () 
   | exception _ -> ()    

jscomp/common/js_config.ml

@@ -52,9 +52,6 @@ let no_version_header = ref false
 
 let cross_module_inline = ref false
 
-let get_cross_module_inline () = !cross_module_inline
-(* let set_cross_module_inline b =
-  cross_module_inline := b *)
 
 
 let diagnose = ref false

jscomp/common/js_config.mli

@@ -48,8 +48,6 @@ val get_package_name : unit -> string option *)
 
 (** cross module inline option *)
 val cross_module_inline : bool ref
-(* val set_cross_module_inline : bool -> unit *)
-val get_cross_module_inline : unit -> bool
 
 (** diagnose option *)
 val diagnose : bool ref 

jscomp/core/bs_cmi_load.ml

@@ -22,26 +22,32 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-#if BS_RELEASE_BUILD then
+#if 
+  BS_RELEASE_BUILD 
+  (*true *)
+then
 
 let load_cmi ~unit_name : Env.Persistent_signature.t option =
   match Config_util.find_opt (unit_name ^".cmi") with 
   | Some filename -> Some {filename; cmi = Cmi_format.read_cmi filename}
   | None ->
     if !Js_config.no_stdlib then None
     else 
-      match Ext_string_array.find_sorted_assoc Builtin_cmi_datasets.module_sets_cmi unit_name with
+      match Ext_string_array.find_sorted Builtin_cmi_datasets.module_names unit_name with
       | Some cmi ->
         if Js_config.get_diagnose () then
           Format.fprintf Format.err_formatter ">Cmi: %s@." unit_name;
-        let lazy cmi = cmi in   
+        let cmi : Cmi_format.cmi_infos = 
+            Marshal.from_string 
+            Builtin_cmi_datasets.module_data.(cmi) 0 in   
         if Js_config.get_diagnose () then
           Format.fprintf Format.err_formatter "<Cmi: %s@." unit_name;
         Some {filename = Sys.executable_name ; 
               cmi }
       | None -> None
 
-let check () = 
+ let check () = ()
+(*  
   Ext_array.iter 
     Builtin_cmi_datasets.module_sets_cmi
     (fun (name,l) ->
@@ -60,7 +66,7 @@ let check () =
        let cmj = Lazy.force l in 
        Format.fprintf Format.err_formatter "%b@." cmj.pure;
        prerr_endline ("<checking " ^ name);
-    ) 
+    )  *)
 #else
 
 let check () = ()

jscomp/core/js_cmj_format.ml

@@ -137,7 +137,7 @@ let get_result  midVal =
   | None  ->
     midVal
   | Some _ -> 
-    if Js_config.get_cross_module_inline () then midVal
+    if !Js_config.cross_module_inline  then midVal
     else {midVal with persistent_closed_lambda = None}  
 
 let rec binarySearchAux arr lo hi (key : string) = 

jscomp/core/js_cmj_format.mli

@@ -70,7 +70,7 @@ type keyed_cmj_value = {
   persistent_closed_lambda : Lam.t option
 }
 
-type t = private {
+type t =  {
   values : keyed_cmj_value array ;
   pure : bool;
   package_spec : Js_packages_info.t ;

jscomp/core/js_cmj_load.ml

@@ -30,15 +30,21 @@
 
 
 let load_builin_unit unit_name : Js_cmj_format.cmj_load_info = 
-#if BS_RELEASE_BUILD then  
-  match Ext_string_array.find_sorted_assoc 
-          Builtin_cmj_datasets.module_sets
+#if 
+BS_RELEASE_BUILD 
+(* true *)
+then  
+  match Ext_string_array.find_sorted
+          Builtin_cmj_datasets.module_names
           unit_name with
-  | Some cmj_table
+  | Some i
     -> 
     if Js_config.get_diagnose () then
       Format.fprintf Format.err_formatter ">Cmj: %s@." unit_name;
-    let lazy cmj_table = cmj_table in   
+    let cmj_table : Js_cmj_format.t = 
+       let values, pure =  Marshal.from_string Builtin_cmj_datasets.module_data.(i) 0 in   
+       {values; pure; package_spec = Js_packages_info.runtime_package_specs;js_file_kind = Little_js} 
+    in 
     if Js_config.get_diagnose () then
       Format.fprintf Format.err_formatter "<Cmj: %s@." unit_name;
     {package_path =  

jscomp/core/js_packages_info.ml

@@ -76,6 +76,13 @@ type t =
     module_systems: package_info  list
   }
 
+let runtime_package_specs : t = {
+  name = Pkg_runtime;
+  module_systems =[
+    {module_system = Es6; path = "lib/es6"};
+    {module_system = NodeJS; path = "lib/js"};
+  ]
+}   
 let same_package_by_name (x : t) (y : t) = x.name = y.name 
 
 let is_runtime_package (x : t) =