diff options
| author | Matthieu Sozeau | 2018-09-06 12:16:54 +0200 |
|---|---|---|
| committer | Matthieu Sozeau | 2018-09-06 12:16:54 +0200 |
| commit | 3af27f47bafb9b9d464de2839c6a425f008d8fc8 (patch) | |
| tree | d8c18ba57fb545822a36bdbe1375b70a596eed27 /proofs | |
| parent | e9fa3e803d752a26ad25b1fcf85cff989cc55b56 (diff) | |
| parent | e705297921639fa0aef7d6e50e58d50257de3160 (diff) | |
Merge PR #8302: Fix #7795: UGraph.AlreadyDeclared with Program
Diffstat (limited to 'proofs')
| -rw-r--r-- | proofs/pfedit.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/proofs/pfedit.ml b/proofs/pfedit.ml index 678c3ea3f7..b48f14ca82 100644 --- a/proofs/pfedit.ml +++ b/proofs/pfedit.ml @@ -173,8 +173,8 @@ let build_by_tactic ?(side_eff=true) env sigma ?(poly=false) typ tac = const_entry_body = Future.chain ce.const_entry_body (fun (pt, _) -> pt, ()) } in let (cb, ctx), () = Future.force ce.const_entry_body in - let univs' = Evd.merge_context_set Evd.univ_rigid (Evd.from_ctx univs) ctx in - cb, status, Evd.evar_universe_context univs' + let univs = UState.merge side_eff Evd.univ_rigid univs ctx in + cb, status, univs let refine_by_tactic env sigma ty tac = (** Save the initial side-effects to restore them afterwards. We set the |