oxcaml · smjleo · Sep 3, 2025 · Jul 18, 2025 · Jul 18, 2025 · Jul 18, 2025
diff --git a/driver/jscompile.ml b/driver/jscompile.ml
@@ -104,7 +104,7 @@ let to_jsir i Typedtree.{ structure; coercion; argument_interface; _ }
     raw_lambda_to_jsir i raw_lambda ~as_arg_for
   in
   Compilenv.save_unit_info
-    (Unit_info.Artifact.filename (Unit_info.cmx i.target))
+    (Unit_info.Artifact.filename (Unit_info.cmjx i.target))
     ~main_module_block_format ~arg_descr;
   jsir
 

diff --git a/middle_end/compilenv.ml b/middle_end/compilenv.ml
@@ -169,19 +169,28 @@ let get_unit_info comp_unit =
       let (infos, crc) =
         if Env.is_imported_opaque (CU.name comp_unit) then (None, None)
         else begin
+          let missing_extension =
+            match !Clflags.jsir with
+            | false -> "cmx"
+            | true -> "cmjx"
+          in
           try
             let filename =
               Load_path.find_normalized
-                (CU.base_filename comp_unit ^ ".cmx") in
+                (CU.base_filename comp_unit ^ "." ^ missing_extension) in
             let (ui, crc) = read_unit_info filename in
             if not (CU.equal ui.ui_unit comp_unit) then
               raise(Error(Illegal_renaming(comp_unit, ui.ui_unit, filename)));
             cache_zero_alloc_info ui.ui_zero_alloc_info;
             (Some ui, Some crc)
           with Not_found ->
-            let warn = Warnings.No_cmx_file (Global_module.Name.to_string name) in
-              Location.prerr_warning Location.none warn;
-              (None, None)
+            let warn =
+              Warnings.No_cmx_file
+                { missing_extension
+                ; module_name = Global_module.Name.to_string name }
+            in
+            Location.prerr_warning Location.none warn;
+            (None, None)
           end
       in
       let import = Import_info.create_normal comp_unit ~crc in

diff --git a/parsing/unit_info.ml b/parsing/unit_info.ml
@@ -134,6 +134,8 @@ let cmti f = mk_artifact ".cmti" f
 let cms f = mk_artifact ".cms" f
 let cmsi f = mk_artifact ".cmsi" f
 let cmj f = mk_artifact ".cmj" f
+let cmja f = mk_artifact ".cmja" f
+let cmjx f = mk_artifact ".cmjx" f
 let annot f = mk_artifact ".annot" f
 
 let companion_obj f = companion_artifact Config.ext_obj f

diff --git a/parsing/unit_info.mli b/parsing/unit_info.mli
@@ -145,6 +145,8 @@ val cmti: t -> Artifact.t
 val cms: t -> Artifact.t
 val cmsi: t -> Artifact.t
 val cmj: t -> Artifact.t
+val cmja : t -> Artifact.t
+val cmjx : t -> Artifact.t
 val annot: t -> Artifact.t
 
 (** The functions below change the type of an artifact by updating the

diff --git a/utils/warnings.ml b/utils/warnings.ml
@@ -105,7 +105,9 @@ type t =
   | Inlining_impossible of string           (* 55 *)
   | Unreachable_case                        (* 56 *)
   | Ambiguous_var_in_pattern_guard of string list (* 57 *)
-  | No_cmx_file of string                   (* 58 *)
+  | No_cmx_file of
+      { missing_extension : string;
+        module_name : string }              (* 58 *)
   | Flambda_assignment_to_non_mutable_value (* 59 *)
   | Unused_module of string                 (* 60 *)
   | Unboxable_type_in_prim_decl of string   (* 61 *)
@@ -1148,10 +1150,11 @@ let message = function
          Only the first match will be used to evaluate the guard expression.\n\
          %a"
         vars_explanation Misc.print_see_manual ref_manual
-  | No_cmx_file name ->
+  | No_cmx_file { missing_extension; module_name } ->
       Printf.sprintf
-        "no cmx file was found in path for module %s, \
-         and its interface was not compiled with -opaque" name
+        "no %s file was found in path for module %s, \
+         and its interface was not compiled with -opaque"
+        missing_extension module_name
   | Flambda_assignment_to_non_mutable_value ->
       "A potential assignment to a non-mutable value was detected \n\
         in this source file.  Such assignments may generate incorrect code \n\

diff --git a/utils/warnings.mli b/utils/warnings.mli
@@ -110,7 +110,9 @@ type t =
   | Inlining_impossible of string           (* 55 *)
   | Unreachable_case                        (* 56 *)
   | Ambiguous_var_in_pattern_guard of string list (* 57 *)
-  | No_cmx_file of string                   (* 58 *)
+  | No_cmx_file of
+      { missing_extension : string;
+        module_name : string }              (* 58 *)
   | Flambda_assignment_to_non_mutable_value (* 59 *)
   | Unused_module of string                 (* 60 *)
   | Unboxable_type_in_prim_decl of string   (* 61 *)