diff options
| author |  Hugo Herbelin <Hugo.Herbelin@inria.fr> | 2017-09-27 00:09:59 +0200 |
|---|---|---|
| committer | Hugo Herbelin <Hugo.Herbelin@inria.fr> | 2017-09-27 00:27:14 +0200 |
| commit | 775fefc7ca57cee1b3b8a368ac26492dbe5a8910 (patch) | |
| tree | db480494456d8a072fa75c7ad6196986a70c4640 | |
| parent | b9740771e8113cb9e607793887be7a12587d0326 (diff) | |
Fixing an old bug in collecting evars with cleared context.
The function Proofview.undefined was collecting twice the evars that
had advanced. Consequently, the functions Proofview.unshelve and
Proofview.with_shelf were possibly doing the same.
| -rw-r--r-- | engine/proofview.ml | 8 | ||||
| -rw-r--r-- | test-suite/success/unshelve.v | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/engine/proofview.ml b/engine/proofview.ml index eef2b83f4..598358c47 100644 --- a/engine/proofview.ml +++ b/engine/proofview.ml @@ -153,8 +153,12 @@ let focus i j sp = ( { sp with comb = new_comb } , context ) (** [undefined defs l] is the list of goals in [l] which are still - unsolved (after advancing cleared goals). *) -let undefined defs l = CList.map_filter (Evarutil.advance defs) l + unsolved (after advancing cleared goals). Note that order matters. *) +let undefined defs l = + List.fold_right (fun evk l -> + match Evarutil.advance defs evk with + | Some evk -> List.add_set Evar.equal evk l + | None -> l) l [] (** Unfocuses a proofview with respect to a context. *) let unfocus c sp = diff --git a/test-suite/success/unshelve.v b/test-suite/success/unshelve.v index 672222bdd..a4fa544cd 100644 --- a/test-suite/success/unshelve.v +++ b/test-suite/success/unshelve.v @@ -9,3 +9,11 @@ unshelve (refine (F _ _ _ _)). + exact (@eq_refl bool true). + exact (@eq_refl unit tt). Qed. + +(* This was failing in 8.6, because of ?a:nat being wrongly duplicated *) + +Goal (forall a : nat, a = 0 -> True) -> True. +intros F. +unshelve (eapply (F _);clear F). +2:reflexivity. +Qed. |