Split Import_info.t into Import_info.{Intf,Impl}.t

This improves clarity, since every `Import.t` is statically either an interface
import or an implementation import and they don't support quite the same
operations. In particular, every implementation import (being an import of a
.cmo/x file) must have a fully-specified compilation unit, whereas in
implementation import might only have a name (with unknown pack prefix).

Produced by reverting commit 4bd7544 from the
'instance-typing' branch.

Author: lukemaurer

backend/asmlibrarian.ml

@@ -74,11 +74,12 @@ let create_archive file_list lib_name =
        let cmxs = Array.of_list cmxs in
        let cmi_index = Compilation_unit.Name.Tbl.create 42 in
        Array.iteri (fun i import ->
-           Compilation_unit.Name.Tbl.add cmi_index (Import_info.name import) i)
+           Compilation_unit.Name.Tbl.add cmi_index
+             (Import_info.Intf.name import) i)
          cmis;
        let cmx_index = Compilation_unit.Tbl.create 42 in
        Array.iteri (fun i import ->
-           Compilation_unit.Tbl.add cmx_index (Import_info.cu import) i)
+           Compilation_unit.Tbl.add cmx_index (Import_info.Impl.cu import) i)
          cmxs;
        let genfns = Cmm_helpers.Generic_fns_tbl.make () in
        let mk_bitmap arr ix entries ~find ~get_name =
@@ -97,11 +98,11 @@ let create_archive file_list lib_name =
              li_imports_cmi =
                mk_bitmap cmis cmi_index unit.ui_imports_cmi
                  ~find:Compilation_unit.Name.Tbl.find
-                 ~get_name:Import_info.name;
+                 ~get_name:Import_info.Intf.name;
              li_imports_cmx =
                mk_bitmap cmxs cmx_index unit.ui_imports_cmx
                  ~find:Compilation_unit.Tbl.find
-                 ~get_name:Import_info.cu })
+                 ~get_name:Import_info.Impl.cu })
          descr_list
        in
        let infos =

backend/asmlink.ml

@@ -61,8 +61,8 @@ let check_cmi_consistency file_name cmis =
   try
     Array.iter
       (fun import ->
-        let name = Import_info.name import in
-        let crco = Import_info.crc_with_unit import in
+        let name = Import_info.Intf.name import in
+        let crco = Import_info.Intf.crc_with_unit import in
         CU.Name.Tbl.replace interfaces name ();
         match crco with
           None -> ()
@@ -80,8 +80,8 @@ let check_cmx_consistency file_name cmxs =
   try
     Array.iter
       (fun import ->
-        let name = Import_info.cu import in
-        let crco = Import_info.crc import in
+        let name = Import_info.Impl.cu import in
+        let crco = Import_info.Impl.crc import in
         implementations := name :: !implementations;
         match crco with
             None ->
@@ -115,15 +115,15 @@ let check_consistency ~unit cmis cmxs =
 let extract_crc_interfaces () =
   CU.Name.Tbl.fold (fun name () crcs ->
       let crc_with_unit = Cmi_consistbl.find crc_interfaces name in
-      Import_info.create name ~crc_with_unit :: crcs)
+      Import_info.Intf.create name ~crc_with_unit :: crcs)
     interfaces
     []
 
 let extract_crc_implementations () =
   Cmx_consistbl.extract !implementations crc_implementations
   |> List.map (fun (cu, crc) ->
        let crc = Option.map (fun ((), crc) -> crc) crc in
-       Import_info.create_normal cu ~crc)
+       Import_info.Impl.create cu ~crc)
 
 (* Add C objects and options and "custom" info from a library descriptor.
    See bytecomp/bytelink.ml for comments on the order of C objects. *)
@@ -159,7 +159,7 @@ let is_required name =
   with Not_found -> false
 
 let add_required by import =
-  let name = Import_info.cu import in
+  let name = Import_info.Impl.cu import in
   try
     let rq = Hashtbl.find missing_globals name in
     rq := by :: !rq

backend/asmlink.mli

@@ -30,8 +30,8 @@ val cached_generic_functions : (module Compiler_owee.Unix_intf.S) -> ppf_dump:fo
 
 val reset : unit -> unit
 val check_consistency: filepath -> Cmx_format.unit_infos -> Digest.t -> unit
-val extract_crc_interfaces: unit -> Import_info.t list
-val extract_crc_implementations: unit -> Import_info.t list
+val extract_crc_interfaces: unit -> Import_info.Intf.t list
+val extract_crc_implementations: unit -> Import_info.Impl.t list
 
 type error =
   | File_not_found of filepath

backend/asmpackager.ml

@@ -72,7 +72,7 @@ let check_units members =
       | PM_impl infos ->
           List.iter
             (fun import ->
-              let unit = Import_info.cu import in
+              let unit = Import_info.Impl.cu import in
               let name = CU.name unit in
               if List.mem name forbidden
               then raise(Error(Forward_reference(mb.pm_file, name))))
@@ -188,9 +188,14 @@ let get_approx ui : Clambda.value_approximation =
 let build_package_cmx members cmxfile =
   let unit_names =
     List.map (fun m -> m.pm_name) members in
-  let filter lst =
+  let filter_cmi lst =
     List.filter (fun import ->
-      not (List.mem (Import_info.name import) unit_names)) lst in
+      not (List.mem (Import_info.Intf.name import) unit_names)) lst
+  in
+  let filter_cmx lst =
+    List.filter (fun import ->
+      let name = Compilation_unit.name (Import_info.Impl.cu import) in
+      not (List.mem name unit_names)) lst in
   let union lst =
     List.fold_left
       (List.fold_left
@@ -233,11 +238,11 @@ let build_package_cmx members cmxfile =
           List.flatten (List.map (fun info -> info.ui_defines) units) @
           [ui.ui_unit];
       ui_imports_cmi =
-          (Import_info.create modname
+          (Import_info.Intf.create modname
             ~crc_with_unit:(Some (ui.ui_unit, Env.crc_of_unit modname))) ::
-            filter (Asmlink.extract_crc_interfaces ());
+            filter_cmi (Asmlink.extract_crc_interfaces ());
       ui_imports_cmx =
-          filter(Asmlink.extract_crc_implementations());
+          filter_cmx(Asmlink.extract_crc_implementations());
       ui_generic_fns =
         { curry_fun =
             union(List.map (fun info -> info.ui_generic_fns.curry_fun) units);

file_formats/cmx_format.mli

@@ -59,9 +59,9 @@ type unit_infos =
                                           (* All compilation units in the
                                              .cmx file (i.e. [ui_unit] and
                                              any produced via [Asmpackager]) *)
-    mutable ui_imports_cmi: Import_info.t list;
+    mutable ui_imports_cmi: Import_info.Intf.t list;
                                           (* Interfaces imported *)
-    mutable ui_imports_cmx: Import_info.t list;
+    mutable ui_imports_cmx: Import_info.Impl.t list;
                                           (* Infos imported *)
     mutable ui_generic_fns: generic_fns;  (* Generic functions needed *)
     mutable ui_export_info: export_info;
@@ -71,8 +71,8 @@ type unit_infos =
 type unit_infos_raw =
   { uir_unit: Compilation_unit.t;
     uir_defines: Compilation_unit.t list;
-    uir_imports_cmi: Import_info.t array;
-    uir_imports_cmx: Import_info.t array;
+    uir_imports_cmi: Import_info.Intf.t array;
+    uir_imports_cmx: Import_info.Impl.t array;
     uir_generic_fns: generic_fns;
     uir_export_info: export_info_raw;
     uir_checks: Checks.Raw.t;
@@ -95,8 +95,8 @@ type lib_unit_info =
     li_imports_cmx : Bitmap.t } (* subset of lib_imports_cmx *)
 
 type library_infos =
-  { lib_imports_cmi: Import_info.t array;
-    lib_imports_cmx: Import_info.t array;
+  { lib_imports_cmi: Import_info.Intf.t array;
+    lib_imports_cmx: Import_info.Impl.t array;
     lib_units: lib_unit_info list;
     lib_generic_fns: generic_fns;
     (* In the following fields the lists are reversed with respect to

middle_end/compilenv.ml

@@ -205,7 +205,7 @@ let get_unit_info comp_unit =
               (None, None)
           end
       in
-      let import = Import_info.create_normal comp_unit ~crc in
+      let import = Import_info.Impl.create comp_unit ~crc in
       current_unit.ui_imports_cmx <- import :: current_unit.ui_imports_cmx;
       CU.Name.Tbl.add global_infos_table cmx_name infos;
       infos

ocaml/boot/ocamlc

@@ -184,8 +184,8 @@ let check_consistency file_name cu =
   begin try
     Array.iter
       (fun import ->
-        let name = Import_info.name import in
-        let crco = Import_info.crc_with_unit import in
+        let name = Import_info.Intf.name import in
+        let crco = Import_info.Intf.crc_with_unit import in
         interfaces := name :: !interfaces;
         match crco with
           None -> ()
@@ -215,7 +215,7 @@ let check_consistency file_name cu =
 let extract_crc_interfaces () =
   Consistbl.extract !interfaces crc_interfaces
   |> List.map (fun (name, crc_with_unit) ->
-       Import_info.create name ~crc_with_unit)
+       Import_info.Intf.create name ~crc_with_unit)
 
 let clear_crc_interfaces () =
   Consistbl.clear crc_interfaces;

ocaml/bytecomp/bytelink.ml

@@ -22,7 +22,7 @@ val reset : unit -> unit
 
 val check_consistency: filepath -> Cmo_format.compilation_unit_descr -> unit
 
-val extract_crc_interfaces: unit -> Import_info.t list
+val extract_crc_interfaces: unit -> Import_info.Intf.t list
 
 type error =
   | File_not_found of filepath

ocaml/bytecomp/bytelink.mli

@@ -224,7 +224,7 @@ let package_object_files ~ppf_dump files targetfile targetname coercion =
     let pos_final = pos_out oc in
     let imports =
       List.filter
-        (fun import -> not (List.mem (Import_info.name import) unit_names))
+        (fun import -> not (List.mem (Import_info.Intf.name import) unit_names))
         (Bytelink.extract_crc_interfaces()) in
     let for_pack_prefix = CU.Prefix.from_clflags () in
     let modname = targetname |> CU.Name.of_string in
@@ -236,7 +236,7 @@ let package_object_files ~ppf_dump files targetfile targetname coercion =
         cu_reloc = List.rev !relocs;
         cu_imports =
           Array.of_list
-            ((Import_info.create modname
+            ((Import_info.Intf.create modname
                ~crc_with_unit:(Some (cu_name, Env.crc_of_unit modname)))
               :: imports);
         cu_primitives = !primitives;

ocaml/bytecomp/bytepackager.ml

@@ -316,7 +316,7 @@ let init_toplevel () =
     (* Recover CRC infos for interfaces *)
     let crcintfs =
       try
-        (Obj.magic (sect.read_struct "CRCS") : Import_info.t array)
+        (Obj.magic (sect.read_struct "CRCS") : Import_info.Intf.t array)
       with Not_found -> [| |] in
     (* Done *)
     sect.close_reader();

ocaml/bytecomp/symtable.ml

@@ -32,7 +32,7 @@ val transl_const: Lambda.structured_constant -> Obj.t
 
 (* Functions for the toplevel *)
 
-val init_toplevel: unit -> Import_info.t array
+val init_toplevel: unit -> Import_info.Intf.t array
 val update_global_table: unit -> unit
 val get_global_value: Ident.t -> Obj.t
 val is_global_defined: Ident.t -> bool

ocaml/bytecomp/symtable.mli

@@ -52,7 +52,7 @@ module Serialized = Types.Make_wrapped(struct type 'a t = int end)
 (* these type abbreviations are not exported;
    they are used to provide consistency across
    input_value and output_value usage. *)
-type crcs = Import_info.t array  (* smaller on disk than using a list *)
+type crcs = Import_info.Intf.t array  (* smaller on disk than using a list *)
 type flags = pers_flags list
 type header = Compilation_unit.t * Serialized.signature
 
@@ -170,10 +170,11 @@ let output_cmi filename oc cmi =
   output_value oc ((cmi.cmi_name, sign) : header);
   flush oc;
   let crc = Digest.file filename in
-  let crcs =
-    Array.append [| Import_info.create_normal cmi.cmi_name ~crc:(Some crc) |]
-      cmi.cmi_crcs
+  let my_info =
+    Import_info.Intf.create (Compilation_unit.name cmi.cmi_name)
+      ~crc_with_unit:(Some (cmi.cmi_name, crc))
   in
+  let crcs = Array.append [| my_info |] cmi.cmi_crcs in
   output_value oc (crcs : crcs);
   output_value oc (cmi.cmi_flags : flags);
   crc

ocaml/file_formats/cmi_format.ml

@@ -24,7 +24,7 @@ type pers_flags =
 type 'sg cmi_infos_generic = {
     cmi_name : Compilation_unit.t;
     cmi_sign : 'sg;
-    cmi_crcs : Import_info.t array;
+    cmi_crcs : Import_info.Intf.t array;
     cmi_flags : pers_flags list;
 }
 

ocaml/file_formats/cmi_format.mli

@@ -30,7 +30,7 @@ type compilation_unit_descr =
     mutable cu_pos: int;                (* Absolute position in file *)
     cu_codesize: int;                   (* Size of code block *)
     cu_reloc: (reloc_info * int) list;  (* Relocation information *)
-    cu_imports: Import_info.t array;    (* Names and CRC of intfs imported *)
+    cu_imports: Import_info.Intf.t array; (* Names and CRC of intfs imported *)
     cu_required_globals: Compilation_unit.t list;
                                         (* Compilation units whose
                                            initialization side effects

ocaml/file_formats/cmo_format.mli

@@ -57,7 +57,7 @@ type cmt_infos = {
   cmt_loadpath : string list;
   cmt_source_digest : Digest.t option;
   cmt_initial_env : Env.t;
-  cmt_imports : Import_info.t array;
+  cmt_imports : Import_info.Intf.t array;
   cmt_interface_digest : Digest.t option;
   cmt_use_summaries : bool;
   cmt_uid_to_loc : Location.t Shape.Uid.Tbl.t;
@@ -176,8 +176,8 @@ let save_cmt filename modname binary_annots sourcefile initial_env cmi shape =
          in
          let source_digest = Option.map Digest.file sourcefile in
          let compare_imports import1 import2 =
-           let modname1 = Import_info.name import1 in
-           let modname2 = Import_info.name import2 in
+           let modname1 = Import_info.Intf.name import1 in
+           let modname2 = Import_info.Intf.name import2 in
            Compilation_unit.Name.compare modname1 modname2
          in
          let get_imports () =

ocaml/file_formats/cmt_format.ml

@@ -60,7 +60,7 @@ type cmt_infos = {
   cmt_loadpath : string list;
   cmt_source_digest : string option;
   cmt_initial_env : Env.t;
-  cmt_imports : Import_info.t array;
+  cmt_imports : Import_info.Intf.t array;
   cmt_interface_digest : Digest.t option;
   cmt_use_summaries : bool;
   cmt_uid_to_loc : Location.t Shape.Uid.Tbl.t;

ocaml/file_formats/cmt_format.mli

@@ -45,9 +45,9 @@ type unit_infos =
                                           (* All compilation units in the
                                              .cmx file (i.e. [ui_name] and
                                              any produced via [Asmpackager]) *)
-    mutable ui_imports_cmi: Import_info.t array;
+    mutable ui_imports_cmi: Import_info.Intf.t array;
                                           (* Interfaces imported *)
-    mutable ui_imports_cmx: Import_info.t array;
+    mutable ui_imports_cmx: Import_info.Impl.t array;
                                           (* Infos imported *)
     mutable ui_curry_fun:
       (Lambda.function_kind * machtype list * machtype) list;

ocaml/file_formats/cmx_format.mli

@@ -22,8 +22,8 @@
 type dynunit = {
   dynu_name: Compilation_unit.t;
   dynu_crc: Digest.t;
-  dynu_imports_cmi: Import_info.t array;
-  dynu_imports_cmx: Import_info.t array;
+  dynu_imports_cmi: Import_info.Intf.t array;
+  dynu_imports_cmx: Import_info.Impl.t array;
   dynu_defines: Compilation_unit.t list;
 }
 

ocaml/file_formats/cmxs_format.mli

@@ -168,7 +168,7 @@ let get_unit_info comp_unit =
               (None, None)
           end
       in
-      let import = Import_info.create_normal comp_unit ~crc in
+      let import = Import_info.Impl.create comp_unit ~crc in
       current_unit.ui_imports_cmx <-
         Array.append [| import |] current_unit.ui_imports_cmx;
       CU.Name.Tbl.add global_infos_table cmx_name infos;

ocaml/middle_end/compilenv.ml

@@ -24,8 +24,8 @@ module DC = Dynlink_common
 module DT = Dynlink_types
 
 let convert_cmi_import import =
-  let name = Import_info.name import |> Compilation_unit.Name.to_string in
-  let crc = Import_info.crc import in
+  let name = Import_info.Intf.name import |> Compilation_unit.Name.to_string in
+  let crc = Import_info.Intf.crc import in
   name, crc
 
 module Bytecode = struct
@@ -91,8 +91,8 @@ module Bytecode = struct
 
   let fold_initial_units ~init ~f =
     Array.fold_left (fun acc import ->
-        let modname = Import_info.name import in
-        let crc = Import_info.crc import in
+        let modname = Import_info.Intf.name import in
+        let crc = Import_info.Intf.crc import in
         let id =
           Compilation_unit.to_global_ident_for_bytecode
             (assume_no_prefix modname)
@@ -237,8 +237,8 @@ module Native = struct
     let crc (t : t) = Some t.dynu_crc
 
     let convert_cmx_import import =
-      let cu = Import_info.cu import |> Compilation_unit.name_as_string in
-      let crc = Import_info.crc import in
+      let cu = Import_info.Impl.cu import |> Compilation_unit.name_as_string in
+      let crc = Import_info.Impl.crc import in
       cu, crc
 
     let interface_imports (t : t) =

ocaml/otherlibs/dynlink/dynlink.ml

@@ -45,7 +45,7 @@ let digest_interface unit loadpath =
     let crc =
       match cmi.Cmi_format.cmi_crcs |> Array.to_list with
         import :: _ ->
-        (match Import_info.crc import with
+        (match Import_info.Intf.crc import with
         | Some crc -> crc
         | None -> raise Corrupted_interface)
       | _             -> raise Corrupted_interface