Properly refresh the local hintdb database in case an external tactic changed

the hypotheses in eauto.

2 files changed, 18 insertions, 11 deletions

diff --git a/tactics/eauto.ml4 b/tactics/eauto.ml4
index 98e7d3ff5..0e9d3dcdc 100644
--- a/tactics/eauto.ml4
+++ b/tactics/eauto.ml4
@@ -282,10 +282,18 @@ module SearchProblem = struct
 	       { depth = s.depth; tacres = res; last_tactic = pp; prev = ps;
 		 dblist = s.dblist; localdb = List.tl s.localdb }
 	     else
-	       { depth = pred s.depth; tacres = res;
-		 dblist = s.dblist; last_tactic = pp; prev = ps;
-		 localdb =
-		   List.addn (nbgl'-nbgl) (List.hd s.localdb) s.localdb })
+	       let newlocal = 
+		 let hyps = pf_hyps g in
+		   List.map (fun gl ->
+		     let gls = {Evd.it = gl; sigma = lgls.Evd.sigma } in
+		     let hyps' = pf_hyps gls in
+		       if hyps' == hyps then List.hd s.localdb
+		       else make_local_hint_db ~ts:full_transparent_state true [] gls)
+		     (List.firstn ((nbgl'-nbgl) + 1) (sig_it lgls))
+	       in
+		 { depth = pred s.depth; tacres = res;
+		   dblist = s.dblist; last_tactic = pp; prev = ps;
+		   localdb = newlocal @ List.tl s.localdb })
 	  l
       in
       List.sort compare (assumption_tacs @ intro_tac @ rec_tacs)
diff --git a/test-suite/bugs/opened/3267.v b/test-suite/bugs/closed/3267.v
index 43eb1377d..5ce1ddf0c 100644
--- a/test-suite/bugs/opened/3267.v
+++ b/test-suite/bugs/closed/3267.v
@@ -1,16 +1,15 @@
 Module a.
-  Hint Extern 0 => progress subst.
+  Local Hint Extern 0 => progress subst.
   Goal forall T (x y : T) (P Q : _ -> Prop), x = y -> (P x -> Q x) -> P y -> Q y.
   Proof.
     intros.
     (* this should not fail *)
-    Fail progress eauto.
-    admit.
+    progress eauto.
   Defined.
 End a.
 
 Module b.
-  Hint Extern 0 => progress subst.
+  Local Hint Extern 0 => progress subst.
   Goal forall T (x y : T) (P Q : _ -> Prop), y = x -> (P x -> Q x) -> P y -> Q y.
   Proof.
     intros.
@@ -19,7 +18,7 @@ Module b.
 End b.
 
 Module c.
-  Hint Extern 0 => progress subst; eauto.
+  Local Hint Extern 0 => progress subst; eauto.
   Goal forall T (x y : T) (P Q : _ -> Prop), x = y -> (P x -> Q x) -> P y -> Q y.
   Proof.
     intros.
@@ -28,10 +27,10 @@ Module c.
 End c.
 
 Module d.
-  Hint Extern 0 => progress subst; repeat match goal with H : _ |- _ => revert H end.
+  Local Hint Extern 0 => progress subst; repeat match goal with H : _ |- _ => revert H end.
   Goal forall T (x y : T) (P Q : _ -> Prop), x = y -> (P x -> Q x) -> P y -> Q y.
   Proof.
     intros.
-    eauto.
+    debug eauto.
   Defined.
 End d.