Skip to content

Rely less on the global environment when computing abstract names. #21138

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 1 commit into from
Sep 30, 2025
Merged

Rely less on the global environment when computing abstract names. #21138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions tactics/abstract.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,15 @@ let declare_abstract = ref (fun ~name ~poly ~sign ~secsign ~opaque ~solve_tac en

let cache_term_by_tactic_then ~opaque ~name_op ?(goal_type=None) tac tacK =
let open Tacticals in
let open Tacmach in
let open Proofview.Notations in
Proofview.tclProofInfo [@ocaml.warning "-3"] >>= fun (name, poly) ->
let suffix = if opaque then "_subproof" else "_subterm" in
let name = name_op_to_name ~name_op ~name suffix in
Proofview.Goal.enter begin fun gl ->
let env = Proofview.Goal.env gl in
let sigma = Proofview.Goal.sigma gl in
(* XXX we cannot use [tclENV] here because toplevel callers may pass wrong
named contexts when nesting abstracts. See #5641. *)
let section_sign = Global.named_context_val () in
let goal_sign = Proofview.Goal.hyps gl in
let sign,secsign =
Expand All @@ -65,7 +66,17 @@ let cache_term_by_tactic_then ~opaque ~name_op ?(goal_type=None) tac tacK =
else (Context.Named.add d s1,s2))
goal_sign (Context.Named.empty, Environ.empty_named_context_val)
in
let name = Namegen.next_global_ident_away (Global.safe_env ()) name (pf_ids_set_of_hyps gl) in
let bad id = match lookup_named_val id section_sign with
| (_ : named_declaration) -> true
| exception Not_found ->
Safe_typing.exists_objlabel (Names.Label.of_id id) (Global.safe_env ()) ||
(* The local environment is OK when it comes to constants though,
including those defined by [tclABSTRACT]. *)
let kn = Lib.make_kn id in
let kn = Names.Constant.make1 kn in
Environ.mem_constant kn env
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this doesn't avoid inductive and constructor names though

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's try with a second variant expecting only constants to be locally defined in the environment and still checking the global safe env for other labels.

in
let name = Namegen.next_ident_away_from name bad in
let concl = match goal_type with
| None -> Proofview.Goal.concl gl
| Some ty -> ty
Expand Down
Loading