diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2017-02-13 09:57:27 +0100 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2017-02-13 09:57:27 +0100 |
| commit | 9ceacf45af6bfe396e36938e2573348ac4d07603 (patch) | |
| tree | bb5200ab8fa1ab24ad547a10e5626585f307c6bf /backend/Inliningproof.v | |
| parent | 236d8a48288ea5845466408cf9d0be2ccd68f9a8 (diff) | |
| parent | c514b1e62302bb674075cd32a412ed47a57cbb5b (diff) | |
| download | compcert-9ceacf45af6bfe396e36938e2573348ac4d07603.tar.gz compcert-9ceacf45af6bfe396e36938e2573348ac4d07603.zip | |
Merge branch 'coq-8.6' of https://github.com/maximedenes/CompCert into maximedenes-coq-8.6
Diffstat (limited to 'backend/Inliningproof.v')
| -rw-r--r-- | backend/Inliningproof.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/Inliningproof.v b/backend/Inliningproof.v index d06fa997..d5d7e033 100644 --- a/backend/Inliningproof.v +++ b/backend/Inliningproof.v @@ -1171,11 +1171,11 @@ Proof. rewrite <- SP in MS0. eapply match_stacks_invariant; eauto. intros. destruct (eq_block b1 stk). - subst b1. rewrite D in H8; inv H8. subst b2. eelim Plt_strict; eauto. + subst b1. rewrite D in H8; inv H8. eelim Plt_strict; eauto. rewrite E in H8; auto. intros. exploit Mem.perm_alloc_inv. eexact H. eauto. destruct (eq_block b1 stk); intros; auto. - subst b1. rewrite D in H8; inv H8. subst b2. eelim Plt_strict; eauto. + subst b1. rewrite D in H8; inv H8. eelim Plt_strict; eauto. intros. eapply Mem.perm_alloc_1; eauto. intros. exploit Mem.perm_alloc_inv. eexact A. eauto. rewrite dec_eq_false; auto. |