diff options
| author | David Monniaux <David.Monniaux@univ-grenoble-alpes.fr> | 2022-02-02 15:18:10 +0100 |
|---|---|---|
| committer | David Monniaux <David.Monniaux@univ-grenoble-alpes.fr> | 2022-02-02 15:18:10 +0100 |
| commit | 8675997219a5883ca639429639b2ab0edff16aa2 (patch) | |
| tree | a0c8267e17cedd822191796a3259c39512937902 /common | |
| parent | 1749be90299633474d2acad39ec8c70df6ccab32 (diff) | |
| parent | a882f78c069f7337dd9f4abff117d4df98ef38a6 (diff) | |
| download | compcert-kvx-8675997219a5883ca639429639b2ab0edff16aa2.tar.gz compcert-kvx-8675997219a5883ca639429639b2ab0edff16aa2.zip | |
Merge remote-tracking branch 'absint/master' into merge_absint
Diffstat (limited to 'common')
| -rw-r--r-- | common/Events.v | 2 | ||||
| -rw-r--r-- | common/Memory.v | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/Events.v b/common/Events.v index 360da52f..7b16339a 100644 --- a/common/Events.v +++ b/common/Events.v @@ -199,7 +199,7 @@ Next Obligation. elimtype False. elim NE. auto. Qed. Next Obligation. - red; intro. elim (H e). rewrite H0. auto. + red; intro; subst; intuition eauto. Qed. CoFixpoint traceinf_of_traceinf' (T': traceinf') : traceinf := diff --git a/common/Memory.v b/common/Memory.v index e243d475..1e94d865 100644 --- a/common/Memory.v +++ b/common/Memory.v @@ -646,11 +646,11 @@ Next Obligation. apply access_max. Qed. Next Obligation. - specialize (nextblock_noaccess m b0 ofs k H0). intros. + exploit (nextblock_noaccess m b0 ofs k). auto. intros NOACC. rewrite PMap.gsspec. destruct (peq b0 b). subst b0. destruct (zle lo ofs). destruct (zlt ofs hi). - assert (perm m b ofs k Freeable). apply perm_cur. apply H; auto. - unfold perm in H2. rewrite H1 in H2. contradiction. + assert (P: perm m b ofs k Freeable) by auto using perm_cur. + unfold perm in P. rewrite NOACC in P. contradiction. auto. auto. auto. Qed. Next Obligation. |