From 012f5fb722a9d5dcef82c800aa54ed50c0a58957 Mon Sep 17 00:00:00 2001
From: Pierre-Marie Pédrot
Date: Mon, 10 Jul 2017 19:11:20 +0200
Subject: Safe API for accessing universe constraints of global references.

Instead of returning either an instance or the set of constraints, we rather
return the corresponding abstracted context. We also push back all uses of
abstraction-breaking calls from these functions out of the kernel.
---
 tactics/elimschemes.ml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tactics')

diff --git a/tactics/elimschemes.ml b/tactics/elimschemes.ml
index 5d9d36958f..e058806a35 100644
--- a/tactics/elimschemes.ml
+++ b/tactics/elimschemes.ml
@@ -48,7 +48,8 @@ let optimize_non_type_induction_scheme kind dep sort _ ind =
   else
     let mib,mip = Inductive.lookup_mind_specif env ind in
     let ctx = Declareops.inductive_polymorphic_context mib in
-    let u = Univ.UContext.instance ctx in
+    let u = Univ.AUContext.instance ctx in
+    let ctx = Univ.UContext.make (u, Univ.AUContext.instantiate u ctx) in
     let ctxset = Univ.ContextSet.of_context ctx in
     let ectx = Evd.evar_universe_context_of ctxset in
     let sigma = Evd.merge_universe_context sigma ectx in
@@ -62,7 +63,8 @@ let build_induction_scheme_in_type dep sort ind =
     let mib,mip = Inductive.lookup_mind_specif env ind in
       Declareops.inductive_polymorphic_context mib
   in
-  let u = Univ.UContext.instance ctx in
+  let u = Univ.AUContext.instance ctx in
+  let ctx = Univ.UContext.make (u, Univ.AUContext.instantiate u ctx) in
   let ctxset = Univ.ContextSet.of_context ctx in
   let sigma = Evd.merge_universe_context sigma (Evd.evar_universe_context_of ctxset) in
   let sigma, c = build_induction_scheme env sigma (ind,u) dep sort in
-- 
cgit v1.2.3