aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Sozeau2015-09-30 18:35:44 +0200
committerMatthieu Sozeau2015-10-02 15:54:12 +0200
commit13337793ea7f709eaa50965797e4f79a3aa51a2b (patch)
tree8e5cab316068f7d5a1e98cd3e8beabeeab76eaad
parentb8a85b65432a974d6a6f1fe5165e05d7196c9321 (diff)
Univs: fix handling of evd's universes and side effects in build_by_tactic
-rw-r--r--proofs/pfedit.ml4
1 files changed, 2 insertions, 2 deletions
diff --git a/proofs/pfedit.ml b/proofs/pfedit.ml
index 05a2975458..00ef8ecafd 100644
--- a/proofs/pfedit.ml
+++ b/proofs/pfedit.ml
@@ -152,9 +152,9 @@ let build_by_tactic ?(side_eff=true) env ctx ?(poly=false) typ tac =
let ce, status, univs = build_constant_by_tactic id ctx sign ~goal_kind:gk typ tac in
let ce = if side_eff then Term_typing.handle_entry_side_effects env ce else { ce with const_entry_body = Future.chain ~pure:true ce.const_entry_body (fun (pt, _) -> pt, Declareops.no_seff) } in
let (cb, ctx), se = Future.force ce.const_entry_body in
+ let univs' = Evd.merge_context_set Evd.univ_rigid (Evd.from_ctx univs) ctx in
assert(Declareops.side_effects_is_empty se);
- assert(Univ.ContextSet.is_empty ctx);
- cb, status, univs
+ cb, status, Evd.evar_universe_context univs'
let refine_by_tactic env sigma ty tac =
(** Save the initial side-effects to restore them afterwards. We set the