这是indexloc提供的服务，不要输入任何密码
Skip to content

A conservative fix for parm lib vs short path #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 12, 2025
Merged

A conservative fix for parm lib vs short path #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73040c4
fix param lib vs. short path
riaqn Nov 12, 2025
36f3f7f
address comments
riaqn Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/ocaml/typing/persistent_env.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ let register_pers_for_short_paths penv modname ps components =
let crc = Import_info.crc import in
name, crc)
in
let deps, alias_deps =
let depends, alias_depends =
List.fold_left
(fun (deps, alias_deps) (name, digest) ->
let name_as_string = Compilation_unit.Name.to_string name in
Expand All @@ -356,10 +356,9 @@ let register_pers_for_short_paths penv modname ps components =
if is_deprecated then Short_paths.Desc.Deprecated
else Short_paths.Desc.Not_deprecated
in
(* CR parameterized modules: this will probably break with parameterized modules *)
let modname_as_string = Global_module.Name.to_string modname in
Short_paths.Basis.load (short_paths_basis penv) modname_as_string
deps alias_deps desc ps.ps_name_info.pn_import.imp_visibility deprecated
(* CR parameterized modules: [depends] and [alias_depends] are missing instantiation. *)
Short_paths.Basis.load (short_paths_basis penv) modname
~depends ~alias_depends desc ps.ps_name_info.pn_import.imp_visibility deprecated
(* Reading persistent structures from .cmi files *)

let save_import penv crc modname impl flags filename =
Expand Down
9 changes: 5 additions & 4 deletions src/ocaml/typing/short_paths.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,7 @@ module String_set = Set.Make(String)
module Basis = struct

type load =
{ name : string;
{ name : Global_module.Name.t;
depends : string list;
alias_depends : string list;
desc : Desc.Module.t;
Expand Down Expand Up @@ -1775,7 +1775,7 @@ module Basis = struct
Rev_deps.extend_up_to t.rev_deps t.next_dep;
List.iter
(fun { name; depends; alias_depends; _ } ->
let index = String_map.find name t.assignment in
let index = String_map.find name.Global_module.Name.head t.assignment in
List.iter
(fun dep_name ->
let dep_index = String_map.find dep_name t.assignment in
Expand All @@ -1792,7 +1792,7 @@ module Basis = struct
let components =
List.map
(fun { name; desc; visibility=load_visibility; deprecated; _ } ->
let index = String_map.find name t.assignment in
let index = String_map.find name.Global_module.Name.head t.assignment in
let origin = Origin.Dependency index in
let id = Ident.global name in
let component_visibility : Desc.visibility =
Expand All @@ -1808,6 +1808,7 @@ module Basis = struct
(fun name acc ->
let index = String_map.find name t.assignment in
let origin = Origin.Dependency index in
let name = Global_module.Name.create_no_args name in
let id = Ident.global name in
Component.Declare_module(origin, id) :: acc)
additions
Expand Down Expand Up @@ -1844,7 +1845,7 @@ module Basis = struct
let add t name =
t.pending_additions <- String_set.add name t.pending_additions

let load t name depends alias_depends desc visibility deprecated =
let load t name ~depends ~alias_depends desc visibility deprecated =
let load = { name; depends; alias_depends; desc; visibility; deprecated } in
t.pending_loads <- load :: t.pending_loads

Expand Down
2 changes: 1 addition & 1 deletion src/ocaml/typing/short_paths.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module Basis : sig

val add : t -> string -> unit

val load : t -> string -> string list -> string list ->
val load : t -> Global_module.Name.t -> depends:string list -> alias_depends:string list ->
Desc.Module.t -> Load_path.visibility -> Desc.deprecated -> unit

end
Expand Down
2 changes: 1 addition & 1 deletion src/ocaml/typing/short_paths_graph.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module Ident = struct
let name = Ident.name

let global name =
Ident.create_persistent name
Ident.create_global name

end

Expand Down
2 changes: 1 addition & 1 deletion src/ocaml/typing/short_paths_graph.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module Ident : sig

val name : t -> string

val global : string -> t
val global : Global_module.Name.t -> t

end

Expand Down