diff options
| author | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2022-01-10 14:54:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-10 14:54:18 +0100 |
| commit | 85b1c4091e13dec13fe03f28e81b256c60f9f7ef (patch) | |
| tree | 6d56a39217183c90643c47b9f4011c8ed2410341 /common | |
| parent | d6b7e2dd683b9da592548fe19dabb936769350c3 (diff) | |
| download | compcert-kvx-85b1c4091e13dec13fe03f28e81b256c60f9f7ef.tar.gz compcert-kvx-85b1c4091e13dec13fe03f28e81b256c60f9f7ef.zip | |
Adapt w.r.t. coq/coq#15442 (#425)
coq/coq#15442 changes the way `Program` names things, to make it uniform w.r.t. the standard naming schema.
This commit removes dependencies on the names chosen by `Program`. Should be backwards compatible.
Co-authored-by: Xavier Leroy <xavier.leroy@college-de-france.fr>
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 c4a6e7f9..0ada1207 100644 --- a/common/Events.v +++ b/common/Events.v @@ -198,7 +198,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 03a6572e..ec436103 100644 --- a/common/Memory.v +++ b/common/Memory.v @@ -602,11 +602,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. |