From ec23b8a8b2947e09e5af7317a2f5787756043a68 Mon Sep 17 00:00:00 2001
From: Pierre-Marie Pédrot
Date: Fri, 22 Dec 2017 18:03:12 +0100
Subject: Cleanup name-binding structure for fresh evar name generation.

We simply use a record and pack the rel and var substitutions in it. We also
properly compose variable substitutions.

Fixes #6534: Fresh variable generation in case of clash is buggy.
---
 tactics/class_tactics.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tactics')

diff --git a/tactics/class_tactics.ml b/tactics/class_tactics.ml
index 9e4d132d4e..cfadfc5353 100644
--- a/tactics/class_tactics.ml
+++ b/tactics/class_tactics.ml
@@ -1569,7 +1569,7 @@ let _ =
   Hook.set Typeclasses.solve_all_instances_hook solve_inst
 
 let resolve_one_typeclass env ?(sigma=Evd.empty) gl unique =
-  let nc, gl, subst, _, _ = Evarutil.push_rel_context_to_named_context env sigma gl in
+  let nc, gl, subst, _ = Evarutil.push_rel_context_to_named_context env sigma gl in
   let (gl,t,sigma) =
     Goal.V82.mk_goal sigma nc gl Store.empty in
   let (ev, _) = destEvar sigma t in
-- 
cgit v1.2.3