Remove cmij cache

Author: cknitt

.github/workflows/ci.yml

@@ -198,6 +198,9 @@ jobs:
       - name: Check for changes in lib folder
         run: git diff --exit-code lib/js lib/es6
 
+      - name: Populate lib/ocaml
+        run: ./scripts/prebuilt.js
+
       - name: Run tests
         if: runner.os != 'Windows'
         run: node scripts/ciTest.js -all
@@ -207,9 +210,7 @@ jobs:
         run: node scripts/ciTest.js -mocha -theme -format
 
       - name: Prepare artifact upload
-        run: |
-          ./scripts/prebuilt.js
-          node .github/workflows/get_artifact_info.js
+        run: node .github/workflows/get_artifact_info.js
 
       - name: "Upload artifacts: binaries"
         uses: actions/upload-artifact@v3
@@ -224,15 +225,6 @@ jobs:
           name: lib-ocaml
           path: lib/ocaml
 
-      - name: "Upload artifacts: cmi cache"
-        if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v3
-        with:
-          name: cmij-cache
-          path: |
-            lib/cmi_cache.bin
-            lib/cmj_cache.bin
-
   package:
     needs: build
     runs-on: ubuntu-latest

jscomp/cmij/cmij_cache.ml

@@ -4,8 +4,8 @@
    (:standard -ccopt -static))))
 
 (executables
- (names cmij_main cmjdump_main)
- (public_names cmij cmjdump)
+ (names cmjdump_main)
+ (public_names cmjdump)
  (flags
   (:standard -w +a-4-9-40-42-69))
  (libraries core))

jscomp/cmij/cmij_cache.mli

@@ -22,44 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-#ifdef RELEASE 
-(*true *)
-
-let cmi_cache_path =
-  let ( // ) = Filename.concat in
-  Filename.dirname Sys.executable_name
-  // Filename.parent_dir_name // "lib" // "cmi_cache.bin"
-  
-let load_cmi_cache () =
-  let channel = open_in_bin cmi_cache_path in
-  let cache: Cmij_cache.t = Marshal.from_channel channel in
-  close_in channel;
-  cache
-
-let cmi_cache = lazy (load_cmi_cache ())
-
-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
-      let {Cmij_cache.module_names; module_data} = Lazy.force cmi_cache in
-      match Ext_string_array.find_sorted module_names unit_name with
-      | Some index ->
-        if !Js_config.diagnose then
-          Format.fprintf Format.err_formatter ">Cmi: %s@." unit_name;
-        let cmi = Cmij_cache.unmarshal_cmi_data module_data.(index) in
-        if !Js_config.diagnose then
-          Format.fprintf Format.err_formatter "<Cmi: %s@." unit_name;
-        Some {filename = Sys.executable_name ; 
-              cmi }
-      | None -> None
-
-#else
-
 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 -> None 
-#endif    
+  | None -> None 

jscomp/cmij/cmij_main.ml

@@ -7,7 +7,3 @@
  (flags
   (:standard -w +a-4-9-27-30-40-41-42-48-70))
  (libraries depends frontend gentype js_parser outcome_printer))
-
-; There exist cyclic dependencies between core and frontend, therefore include frontend files here:
-
-(copy_files# ../cmij/cmij_cache.{ml,mli})

jscomp/cmij/cmij_main.mli

@@ -52,15 +52,7 @@ let load_unit_with_file unit_name : Js_cmj_format.cmj_load_info =
        (* hacking relying on the convention of pkg/lib/ocaml/xx.cmj*)
        Filename.dirname (Filename.dirname (Filename.dirname f)); 
      cmj_table =  Js_cmj_format.from_file f}
-  | None -> 
-    if !Js_config.no_stdlib then Bs_exception.error (Cmj_not_found unit_name)
-    else 
-#ifdef RELEASE
-        Js_cmj_load_builtin_unit.load_builin_unit unit_name 
-#else
-        Bs_exception.error (Cmj_not_found unit_name)
-#endif      
-
+  | None -> Bs_exception.error (Cmj_not_found unit_name)
 
 (* we can disable loading from file for troubleshooting
    Note in dev mode we still allow loading from file is to 

jscomp/cmij/dune

@@ -27,7 +27,7 @@ let init_path () =
   let exp_dirs =
     List.map (Misc.expand_directory Config.standard_library) dirs
   in
-  Config.load_path := List.rev_append exp_dirs [];
+  Config.load_path := List.rev_append exp_dirs [Config.standard_library];
   Env.reset_cache ()
 
 (* Return the initial environment in which compilation proceeds. *)

jscomp/core/bs_cmi_load.ml

@@ -9,6 +9,5 @@ mv binaries-linux linux
 mv binaries-linuxarm64 linuxarm64
 mv binaries-win32 win32
 
-mv cmij-cache/*.bin lib
 mv lib-ocaml lib/ocaml
 mv ninja/COPYING ninja.COPYING

jscomp/core/dune

@@ -1468,13 +1468,6 @@ function main() {
             cwd: jscompDir,
             stdio: [0, 1, 2],
           });
-          if (!isPlayground) {
-            cp.execFileSync(path.join(duneBinDir, "cmij"), {
-              encoding: "utf8",
-              cwd: jscompDir,
-              stdio: [0, 1, 2],
-            });
-          }
         } catch (e) {
           console.log(e.message);
           console.log(`please run "./scripts/ninja.js config" first`);

jscomp/core/js_cmj_load.ml

@@ -70,11 +70,9 @@ function populateLibDir() {
     fs.mkdirSync(ocaml_dir);
   }
 
-  // sync up with cmij_main.ml
   installDirBy(runtime_dir, ocaml_dir, function (file) {
     var y = path.parse(file);
-    return y.name === "js" && y.ext !== ".cmj";
-    // install js.cmi, js.mli
+    return y.name === "js";
   });
 
   // for merlin or other IDE
@@ -84,6 +82,7 @@ function populateLibDir() {
     ".res",
     ".resi",
     ".cmi",
+    ".cmj",
     ".cmt",
     ".cmti",
   ];