diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2016-07-11 08:30:14 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2016-07-11 08:30:14 +0200 |
| commit | d5b86a98560c36fbcb3ab8d2698e09147acda512 (patch) | |
| tree | f3ab850a1620fa5d3dbbe439998d09de8e0d817d /common/Separation.v | |
| parent | ea2d6b70ed06c60dba9ba81cf53883c85fb92068 (diff) | |
| parent | 3872ce9f9806d9af334b1fde092145edf664d170 (diff) | |
| download | compcert-d5b86a98560c36fbcb3ab8d2698e09147acda512.tar.gz compcert-d5b86a98560c36fbcb3ab8d2698e09147acda512.zip | |
Merge branch 'master' into add-file
Diffstat (limited to 'common/Separation.v')
| -rw-r--r-- | common/Separation.v | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/common/Separation.v b/common/Separation.v index 6a7ffbea..efcd3281 100644 --- a/common/Separation.v +++ b/common/Separation.v @@ -620,7 +620,7 @@ Next Obligation. eauto with mem. } destruct H. constructor. - destruct mi_inj. constructor; intros. -+ eapply Mem.perm_unchanged_on; eauto. eapply IMG; eauto. ++ eapply Mem.perm_unchanged_on; eauto. + eauto. + rewrite (Mem.unchanged_on_contents _ _ _ H0); eauto. - assumption. @@ -630,7 +630,6 @@ Next Obligation. - intros. destruct (Mem.perm_dec m0 b1 ofs Max Nonempty); auto. eapply mi_perm_inv; eauto. eapply Mem.perm_unchanged_on_2; eauto. - eapply IMG; eauto. Qed. Next Obligation. eapply Mem.valid_block_inject_2; eauto. |