diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2016-07-08 14:43:57 +0200 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2016-07-08 14:43:57 +0200 |
| commit | e73d5db97cdb22cce2ee479469f62af3c4b6264a (patch) | |
| tree | 035d31018c2abec698eb49a205c60bbf5c24ba0d /common/Separation.v | |
| parent | db2445b3b745abd1a26f5a832a29ca269c725277 (diff) | |
| download | compcert-kvx-e73d5db97cdb22cce2ee479469f62af3c4b6264a.tar.gz compcert-kvx-e73d5db97cdb22cce2ee479469f62af3c4b6264a.zip | |
Port to Coq 8.5pl2
Manual merging of branch jhjourdan:coq8.5.
No other change un functionality.
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. |