[src][state][loc_dep][1/n] read external cm files if needed

This fixes the remaining FP/FN

Author: fantazio

check/classic/classic.ref

@@ -43,23 +43,11 @@
 ./examples/using_dune/reduced_lib/reduced_lib.mli:19: Values_in_submodules.Exported.internally_used
 ./examples/using_dune/reduced_lib/reduced_lib.mli:27: Values_in_submodules_no_intf.Exported.used_by_API
 ./examples/using_dune/reduced_lib/reduced_lib.mli:28: Values_in_submodules_no_intf.Exported.internally_used
-./examples/using_dune/reduced_lib/values.mli:1: used: Should not be detected
-./examples/using_dune/reduced_lib/values.mli:2: used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values.mli:3: internally_used: Should not be detected
-./examples/using_dune/reduced_lib/values.mli:4: externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values.mli:7: lib_internal_unused
 ./examples/using_dune/reduced_lib/values.mli:8: lib_internal_internally_used
-./examples/using_dune/reduced_lib/values_in_submodules.mli:2: Exported.used: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:3: Exported.used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:4: Exported.internally_used: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:5: Exported.externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values_in_submodules.mli:8: Exported.lib_internal_unused
 ./examples/using_dune/reduced_lib/values_in_submodules.mli:9: Exported.lib_internal_internally_used
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:3: Exported.used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:5: Exported.externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:8: Exported.lib_internal_unused
-./examples/using_dune/reduced_lib/values_no_intf.ml:2: used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values_no_intf.ml:4: externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values_no_intf.ml:11: lib_internal_unused
 
 ./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg
@@ -635,7 +623,7 @@ Nothing else to report in this section
 --------------------------------------------------------------------------------
 
 
-Total: 548
+Total: 536
 Success: 531
-Failed: 17
-Ratio: 96.897810219%
+Failed: 5
+Ratio: 99.0671641791%

check/internal/internal.ref

@@ -31,17 +31,9 @@
 ./examples/using_dune/reduced_lib/reduced_lib.mli:19: Values_in_submodules.Exported.internally_used
 ./examples/using_dune/reduced_lib/reduced_lib.mli:27: Values_in_submodules_no_intf.Exported.used_by_API
 ./examples/using_dune/reduced_lib/reduced_lib.mli:28: Values_in_submodules_no_intf.Exported.internally_used
-./examples/using_dune/reduced_lib/values.mli:2: used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values.mli:4: externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values.mli:7: lib_internal_unused
-./examples/using_dune/reduced_lib/values_in_submodules.mli:3: Exported.used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:5: Exported.externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values_in_submodules.mli:8: Exported.lib_internal_unused
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:3: Exported.used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:5: Exported.externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:8: Exported.lib_internal_unused
-./examples/using_dune/reduced_lib/values_no_intf.ml:2: used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values_no_intf.ml:4: externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values_no_intf.ml:11: lib_internal_unused
 
 ./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg
@@ -586,7 +578,7 @@ Nothing else to report in this section
 --------------------------------------------------------------------------------
 
 
-Total: 502
+Total: 494
 Success: 489
-Failed: 13
-Ratio: 97.4103585657%
+Failed: 5
+Ratio: 98.987854251%

check/threshold-1/threshold-1.ref

@@ -31,17 +31,9 @@
 ./examples/using_dune/reduced_lib/reduced_lib.mli:19: Values_in_submodules.Exported.internally_used
 ./examples/using_dune/reduced_lib/reduced_lib.mli:27: Values_in_submodules_no_intf.Exported.used_by_API
 ./examples/using_dune/reduced_lib/reduced_lib.mli:28: Values_in_submodules_no_intf.Exported.internally_used
-./examples/using_dune/reduced_lib/values.mli:2: used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values.mli:4: externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values.mli:7: lib_internal_unused
-./examples/using_dune/reduced_lib/values_in_submodules.mli:3: Exported.used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:5: Exported.externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values_in_submodules.mli:8: Exported.lib_internal_unused
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:3: Exported.used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:5: Exported.externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:8: Exported.lib_internal_unused
-./examples/using_dune/reduced_lib/values_no_intf.ml:2: used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values_no_intf.ml:4: externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values_no_intf.ml:11: lib_internal_unused
 
 ./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg
@@ -201,28 +193,20 @@
 ./examples/using_dune/reduced_lib/reduced_lib.mli:20: Values_in_submodules.Exported.externally_used
 ./examples/using_dune/reduced_lib/reduced_lib.mli:26: Values_in_submodules_no_intf.Exported.used
 ./examples/using_dune/reduced_lib/reduced_lib.mli:29: Values_in_submodules_no_intf.Exported.externally_used
-./examples/using_dune/reduced_lib/values.mli:1: used: Should not be detected
-./examples/using_dune/reduced_lib/values.mli:2: used_by_API: Not detected
-./examples/using_dune/reduced_lib/values.mli:3: internally_used: Should not be detected
-./examples/using_dune/reduced_lib/values.mli:4: externally_used: Not detected
+./examples/using_dune/reduced_lib/values.mli:2: used_by_API
+./examples/using_dune/reduced_lib/values.mli:4: externally_used
 ./examples/using_dune/reduced_lib/values.mli:8: lib_internal_internally_used
 ./examples/using_dune/reduced_lib/values.mli:9: lib_internal_externally_used
-./examples/using_dune/reduced_lib/values_in_submodules.mli:2: Exported.used: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:3: Exported.used_by_API: Not detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:4: Exported.internally_used: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:5: Exported.externally_used: Not detected
+./examples/using_dune/reduced_lib/values_in_submodules.mli:3: Exported.used_by_API
+./examples/using_dune/reduced_lib/values_in_submodules.mli:5: Exported.externally_used
 ./examples/using_dune/reduced_lib/values_in_submodules.mli:9: Exported.lib_internal_internally_used
 ./examples/using_dune/reduced_lib/values_in_submodules.mli:10: Exported.lib_internal_externally_used
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:2: Exported.used: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:3: Exported.used_by_API: Not detected
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:4: Exported.internally_used: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:5: Exported.externally_used: Not detected
+./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:3: Exported.used_by_API
+./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:5: Exported.externally_used
 ./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:9: Exported.lib_internal_internally_used
 ./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:10: Exported.lib_internal_externally_used
-./examples/using_dune/reduced_lib/values_no_intf.ml:1: used: Should not be detected
-./examples/using_dune/reduced_lib/values_no_intf.ml:2: used_by_API: Not detected
-./examples/using_dune/reduced_lib/values_no_intf.ml:3: internally_used: Should not be detected
-./examples/using_dune/reduced_lib/values_no_intf.ml:4: externally_used: Not detected
+./examples/using_dune/reduced_lib/values_no_intf.ml:2: used_by_API
+./examples/using_dune/reduced_lib/values_no_intf.ml:4: externally_used
 ./examples/using_dune/reduced_lib/values_no_intf.ml:12: lib_internal_internally_used
 ./examples/using_dune/reduced_lib/values_no_intf.ml:13: lib_internal_externally_used
 
@@ -971,7 +955,7 @@ Nothing else to report in this section
 --------------------------------------------------------------------------------
 
 
-Total: 841
-Success: 812
-Failed: 29
-Ratio: 96.5517241379%
+Total: 825
+Success: 820
+Failed: 5
+Ratio: 99.3939393939%

check/threshold-3-0.5/threshold-3-0.5.ref

@@ -31,17 +31,9 @@
 ./examples/using_dune/reduced_lib/reduced_lib.mli:19: Values_in_submodules.Exported.internally_used
 ./examples/using_dune/reduced_lib/reduced_lib.mli:27: Values_in_submodules_no_intf.Exported.used_by_API
 ./examples/using_dune/reduced_lib/reduced_lib.mli:28: Values_in_submodules_no_intf.Exported.internally_used
-./examples/using_dune/reduced_lib/values.mli:2: used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values.mli:4: externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values.mli:7: lib_internal_unused
-./examples/using_dune/reduced_lib/values_in_submodules.mli:3: Exported.used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:5: Exported.externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values_in_submodules.mli:8: Exported.lib_internal_unused
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:3: Exported.used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:5: Exported.externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:8: Exported.lib_internal_unused
-./examples/using_dune/reduced_lib/values_no_intf.ml:2: used_by_API: Should not be detected
-./examples/using_dune/reduced_lib/values_no_intf.ml:4: externally_used: Should not be detected
 ./examples/using_dune/reduced_lib/values_no_intf.ml:11: lib_internal_unused
 
 ./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:1: unused_fun_with_single_never_used_opt_arg
@@ -201,28 +193,20 @@
 ./examples/using_dune/reduced_lib/reduced_lib.mli:20: Values_in_submodules.Exported.externally_used
 ./examples/using_dune/reduced_lib/reduced_lib.mli:26: Values_in_submodules_no_intf.Exported.used
 ./examples/using_dune/reduced_lib/reduced_lib.mli:29: Values_in_submodules_no_intf.Exported.externally_used
-./examples/using_dune/reduced_lib/values.mli:1: used: Should not be detected
-./examples/using_dune/reduced_lib/values.mli:2: used_by_API: Not detected
-./examples/using_dune/reduced_lib/values.mli:3: internally_used: Should not be detected
-./examples/using_dune/reduced_lib/values.mli:4: externally_used: Not detected
+./examples/using_dune/reduced_lib/values.mli:2: used_by_API
+./examples/using_dune/reduced_lib/values.mli:4: externally_used
 ./examples/using_dune/reduced_lib/values.mli:8: lib_internal_internally_used
 ./examples/using_dune/reduced_lib/values.mli:9: lib_internal_externally_used
-./examples/using_dune/reduced_lib/values_in_submodules.mli:2: Exported.used: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:3: Exported.used_by_API: Not detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:4: Exported.internally_used: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:5: Exported.externally_used: Not detected
+./examples/using_dune/reduced_lib/values_in_submodules.mli:3: Exported.used_by_API
+./examples/using_dune/reduced_lib/values_in_submodules.mli:5: Exported.externally_used
 ./examples/using_dune/reduced_lib/values_in_submodules.mli:9: Exported.lib_internal_internally_used
 ./examples/using_dune/reduced_lib/values_in_submodules.mli:10: Exported.lib_internal_externally_used
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:2: Exported.used: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:3: Exported.used_by_API: Not detected
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:4: Exported.internally_used: Should not be detected
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:5: Exported.externally_used: Not detected
+./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:3: Exported.used_by_API
+./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:5: Exported.externally_used
 ./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:9: Exported.lib_internal_internally_used
 ./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:10: Exported.lib_internal_externally_used
-./examples/using_dune/reduced_lib/values_no_intf.ml:1: used: Should not be detected
-./examples/using_dune/reduced_lib/values_no_intf.ml:2: used_by_API: Not detected
-./examples/using_dune/reduced_lib/values_no_intf.ml:3: internally_used: Should not be detected
-./examples/using_dune/reduced_lib/values_no_intf.ml:4: externally_used: Not detected
+./examples/using_dune/reduced_lib/values_no_intf.ml:2: used_by_API
+./examples/using_dune/reduced_lib/values_no_intf.ml:4: externally_used
 ./examples/using_dune/reduced_lib/values_no_intf.ml:12: lib_internal_internally_used
 ./examples/using_dune/reduced_lib/values_no_intf.ml:13: lib_internal_externally_used
 
@@ -370,17 +354,17 @@
 ./examples/using_dune/preprocessed_lib/preprocessed_no_intf.ml:59: internally_used_f
 ./examples/using_dune/preprocessed_lib/preprocessed_no_intf.ml:64: externally_used_f
 
-./examples/using_dune/reduced_lib/values.mli:1: used: Not detected
-./examples/using_dune/reduced_lib/values.mli:3: internally_used: Not detected
+./examples/using_dune/reduced_lib/values.mli:1: used
+./examples/using_dune/reduced_lib/values.mli:3: internally_used
 ./examples/using_dune/reduced_lib/values.mli:6: lib_internal_used
-./examples/using_dune/reduced_lib/values_in_submodules.mli:2: Exported.used: Not detected
-./examples/using_dune/reduced_lib/values_in_submodules.mli:4: Exported.internally_used: Not detected
+./examples/using_dune/reduced_lib/values_in_submodules.mli:2: Exported.used
+./examples/using_dune/reduced_lib/values_in_submodules.mli:4: Exported.internally_used
 ./examples/using_dune/reduced_lib/values_in_submodules.mli:7: Exported.lib_internal_used
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:2: Exported.used: Not detected
-./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:4: Exported.internally_used: Not detected
+./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:2: Exported.used
+./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:4: Exported.internally_used
 ./examples/using_dune/reduced_lib/values_in_submodules_no_intf.ml:7: Exported.lib_internal_used
-./examples/using_dune/reduced_lib/values_no_intf.ml:1: used: Not detected
-./examples/using_dune/reduced_lib/values_no_intf.ml:3: internally_used: Not detected
+./examples/using_dune/reduced_lib/values_no_intf.ml:1: used
+./examples/using_dune/reduced_lib/values_no_intf.ml:3: internally_used
 ./examples/using_dune/reduced_lib/values_no_intf.ml:10: lib_internal_used
 
 ./examples/using_dune/unwrapped_lib/obj/with_class.mli:33: fun_class_factory
@@ -1356,7 +1340,7 @@ Nothing else to report in this section
 --------------------------------------------------------------------------------
 
 
-Total: 1153
-Success: 1116
-Failed: 37
-Ratio: 96.790980052%
+Total: 1137
+Success: 1132
+Failed: 5
+Ratio: 99.5602462621%

src/state/file_infos.ml

@@ -64,7 +64,7 @@ let init_from_cmti_file cmti_file =
   let cmti_uid_to_decl = Some cmt_infos.cmt_uid_to_decl in
   {file_infos with cmti_uid_to_decl}
 
-let init_from_cmt_file cmt_file =
+let init_from_cmt_file ~cm_paths cmt_file =
   let* file_infos, cmt_infos = init_from_cm_file cmt_file in
   let* cmt_struct =
     match cmt_infos.cmt_annots with
@@ -82,26 +82,26 @@ let init_from_cmt_file cmt_file =
     | Ok file_infos -> file_infos.cmti_uid_to_decl
   in
   let+ location_dependencies =
-    Location_dependencies.init cmt_infos cmti_uid_to_decl
+    Location_dependencies.init ~cm_paths cmt_infos cmti_uid_to_decl
   in
   let file_infos =
     {file_infos with cmt_struct; cmti_uid_to_decl; location_dependencies}
   in
   file_infos, cmt_infos
 
-let init cm_file =
+let init ~cm_paths cm_file =
   match Filename.extension cm_file with
   | ".cmt" ->
-      let+ file_infos, _ = init_from_cmt_file cm_file in
+      let+ file_infos, _ = init_from_cmt_file ~cm_paths cm_file in
       file_infos
   | ".cmti" -> (
       (* Using cmt_infos is not critical. The intent is to mirror the behavior
          on cmt files, where both cmt and cmti are read. *)
       let filled_with_cmt_infos =
         let cmt_file = Filename.remove_extension cm_file ^ ".cmt" in
-        let* file_infos, cmt_infos = init_from_cmt_file cmt_file in
+        let* file_infos, cmt_infos = init_from_cmt_file ~cm_paths cmt_file in
         let+ location_dependencies =
-          Location_dependencies.init cmt_infos file_infos.cmti_uid_to_decl
+          Location_dependencies.init ~cm_paths cmt_infos file_infos.cmti_uid_to_decl
         in
         {file_infos with location_dependencies}
       in
@@ -113,15 +113,15 @@ let init cm_file =
   )
   | _ -> Result.error (cm_file ^ ": not a .cmti or .cmt file")
 
-let change_file file_infos cm_file =
+let change_file ~cm_paths file_infos cm_file =
   let no_ext = Filename.remove_extension cm_file in
   assert(no_ext = Filename.remove_extension file_infos.cm_file);
   match Filename.extension cm_file, file_infos with
   | ".cmt", {cmt_struct = (Some _ as cs); cmi_sign; cmti_uid_to_decl; _} ->
       let* res, cmt_infos = init_from_cm_file cm_file in
       let+ location_dependencies =
         match file_infos.location_dependencies with
-        | [] -> Location_dependencies.init cmt_infos cmti_uid_to_decl
+        | [] -> Location_dependencies.init ~cm_paths cmt_infos cmti_uid_to_decl
         | loc_dep -> (* They have already been computed *)
             Result.ok loc_dep
       in
@@ -131,7 +131,7 @@ let change_file file_infos cm_file =
       {res with cmti_uid_to_decl = cutd; cmt_struct; location_dependencies}
   | _ ->
       (* invalid extension or the corresponding info is None *)
-      init cm_file
+      init ~cm_paths cm_file
 
 let has_sourcepath file_infos = Option.is_some file_infos.sourcepath
 

src/state/file_infos.mli

@@ -16,20 +16,22 @@ type t = {
 
 val empty : t (** No file info *)
 
-val init : string -> (t, string) result
+val init : cm_paths: Utils.StringSet.t -> string -> (t, string) result
 (** [init cm_file] expects either a [.cmti] or [.cmt] filepath as argument and
     returns an [Ok t] with [t] filled using the [cmtit_file].
     In case the file does not exist, it cannot be read, or its extension is
     invalid, then it returns an [Err msg] with msg a string
-    describing the issue. *)
+    describing the issue.
+    [cm_paths] is used to load external cm files if necessary. *)
 
-val change_file : t -> string -> (t, string) result
+val change_file : cm_paths: Utils.StringSet.t -> t -> string -> (t, string) result
 (** [change_file t cm_file] expects either a [.cmti] or a [.cmt] filepath as
     argument. [cm_file] must be the same as [t.cm_file], ignoring the
     extension.
     The returned value is either a simple update of [t] if the necessary
     [cmti_infos] or [cmt_infos] is available. Otherwise, it is the result of
-    [init t] *)
+    [init t].
+    [cm_paths] is used to load external cm files if necessary. *)
 
 val has_sourcepath : t -> bool