From 4109b8945103850c3e063e15c13aac9104a55846 Mon Sep 17 00:00:00 2001
From: Pierre-Marie Pédrot
Date: Tue, 25 Aug 2020 16:26:01 +0200
Subject: Remove a call to the old refiner in ssr.

---
 plugins/ssr/ssrelim.ml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/ssr/ssrelim.ml b/plugins/ssr/ssrelim.ml
index 1e182b52fa..582c45cde1 100644
--- a/plugins/ssr/ssrelim.ml
+++ b/plugins/ssr/ssrelim.ml
@@ -478,11 +478,16 @@ let revtoptac n0 =
   Proofview.Goal.enter begin fun gl ->
   let sigma = Proofview.Goal.sigma gl in
   let concl = Proofview.Goal.concl gl in
+  let env = Proofview.Goal.env gl in
   let n = nb_prod sigma concl - n0 in
   let dc, cl = EConstr.decompose_prod_n_assum sigma n concl in
-  let dc' = dc @ [Context.Rel.Declaration.LocalAssum(make_annot (Name rev_id) Sorts.Relevant, EConstr.it_mkProd_or_LetIn cl (List.rev dc))] in
-  let f = EConstr.it_mkLambda_or_LetIn (mkEtaApp (EConstr.mkRel (n + 1)) (-n) 1) dc' in
-  Logic.refiner ~check:true EConstr.Unsafe.(to_constr (EConstr.mkApp (f, [|Evarutil.mk_new_meta ()|])))
+  let ty = EConstr.it_mkProd_or_LetIn cl (List.rev dc) in
+  let dc' = dc @ [Context.Rel.Declaration.LocalAssum(make_annot (Name rev_id) Sorts.Relevant, ty)] in
+  Refine.refine ~typecheck:true begin fun sigma ->
+    let f = EConstr.it_mkLambda_or_LetIn (mkEtaApp (EConstr.mkRel (n + 1)) (-n) 1) dc' in
+    let sigma, ev = Evarutil.new_evar env sigma ty in
+    sigma, (EConstr.mkApp (f, [|ev|]))
+  end
   end
 
 let nothing_to_inject =
-- 
cgit v1.2.3


From ce02197f862c2b2f2240f541fb11569a24636c6c Mon Sep 17 00:00:00 2001
From: Pierre-Marie Pédrot
Date: Thu, 27 Aug 2020 17:08:51 +0200
Subject: Remove the now unused Evarutil.mk_new_meta function.

This is legacy engine code that shouldn't have been used for a long time.
---
 engine/evarutil.ml  | 2 --
 engine/evarutil.mli | 1 -
 2 files changed, 3 deletions(-)

diff --git a/engine/evarutil.ml b/engine/evarutil.ml
index 7beb7ff738..d719731464 100644
--- a/engine/evarutil.ml
+++ b/engine/evarutil.ml
@@ -183,8 +183,6 @@ let meta_ctr, meta_counter_summary_tag =
 
 let new_meta () = incr meta_ctr; !meta_ctr
 
-let mk_new_meta () = EConstr.mkMeta(new_meta())
-
 (* The list of non-instantiated existential declarations (order is important) *)
 
 let non_instantiated sigma =
diff --git a/engine/evarutil.mli b/engine/evarutil.mli
index a8fc9ef5e2..9d2c29547e 100644
--- a/engine/evarutil.mli
+++ b/engine/evarutil.mli
@@ -21,7 +21,6 @@ open EConstr
 
 (** [new_meta] is a generator of unique meta variables *)
 val new_meta : unit -> metavariable
-val mk_new_meta : unit -> constr
 
 (** {6 Creating a fresh evar given their type and context} *)
 
-- 
cgit v1.2.3