Skip to content
Snippets Groups Projects
Commit 414d0dfa authored by Ralf Jung's avatar Ralf Jung
Browse files

update dependencies; fix for mapsto_malid_2 changes

parent b1c2c3df
No related branches found
No related tags found
No related merge requests found
Pipeline #36867 passed
...@@ -9,6 +9,6 @@ build: [make "-j%{jobs}%"] ...@@ -9,6 +9,6 @@ build: [make "-j%{jobs}%"]
install: [make "install"] install: [make "install"]
remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/reloc"] remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/reloc"]
depends: [ depends: [
"coq-iris" { (= "dev.2020-10-20.2.c65b38ea") | (= "dev") } "coq-iris" { (= "dev.2020-11-03.2.231ab52f") | (= "dev") }
"coq-autosubst" { = "dev.coq86" } "coq-autosubst" { = "dev.coq86" }
] ]
...@@ -64,7 +64,7 @@ Section namegen_refinement. ...@@ -64,7 +64,7 @@ Section namegen_refinement.
{ iIntros (Hy). destruct Hy as [y Hy]. { iIntros (Hy). destruct Hy as [y Hy].
rewrite (big_sepS_elem_of _ L (l',y) Hy). rewrite (big_sepS_elem_of _ L (l',y) Hy).
iDestruct "HL" as "[Hl _]". iDestruct "HL" as "[Hl _]".
iDestruct (gen_heap.mapsto_valid_2 with "Hl Hl'") as %Hfoo. iDestruct (gen_heap.mapsto_valid_2 with "Hl Hl'") as %[Hfoo _].
compute in Hfoo. eauto. } compute in Hfoo. eauto. }
iAssert (( x, (x, S n) L) False)%I with "[HL]" as %Hc. iAssert (( x, (x, S n) L) False)%I with "[HL]" as %Hc.
{ iIntros (Hx). destruct Hx as [x Hy]. { iIntros (Hx). destruct Hx as [x Hy].
......
...@@ -232,7 +232,7 @@ Section proofs. ...@@ -232,7 +232,7 @@ Section proofs.
iDestruct "Hx'" as "[Hx' Hx'1]". iDestruct "Hx'" as "[Hx' Hx'1]".
iDestruct "Hbb" as "[(Hb & Hb' & Hx2 & Hx'2) | Hbb]". iDestruct "Hbb" as "[(Hb & Hb' & Hx2 & Hx'2) | Hbb]".
{ iCombine "Hx Hx1" as "Hx". { iCombine "Hx Hx1" as "Hx".
iDestruct (mapsto_valid_2 with "Hx Hx2") as %Hfoo. exfalso. iDestruct (mapsto_valid_2 with "Hx Hx2") as %[Hfoo _]. exfalso.
compute in Hfoo. eauto. } compute in Hfoo. eauto. }
iMod ("Hcl" with "[Hx Hx' Hbb]") as "_". iMod ("Hcl" with "[Hx Hx' Hbb]") as "_".
{ iNext. iExists (S n). { iNext. iExists (S n).
...@@ -244,7 +244,7 @@ Section proofs. ...@@ -244,7 +244,7 @@ Section proofs.
iDestruct (mapsto_agree with "Hx Hx1") as %->. iDestruct (mapsto_agree with "Hx Hx1") as %->.
iDestruct "Hbb" as "[(Hb & Hb' & Hx2 & Hx'2) | (Hb & Hb')]". iDestruct "Hbb" as "[(Hb & Hb' & Hx2 & Hx'2) | (Hb & Hb')]".
{ iCombine "Hx Hx1" as "Hx". { iCombine "Hx Hx1" as "Hx".
iDestruct (mapsto_valid_2 with "Hx Hx2") as %Hfoo. exfalso. iDestruct (mapsto_valid_2 with "Hx Hx2") as %[Hfoo _]. exfalso.
compute in Hfoo. eauto. } compute in Hfoo. eauto. }
iModIntro; iExists _; iFrame; iNext. iIntros "Hb". iModIntro; iExists _; iFrame; iNext. iIntros "Hb".
rel_store_r. rel_store_r.
......
...@@ -37,7 +37,7 @@ Section rules. ...@@ -37,7 +37,7 @@ Section rules.
is_offer γ1 l P1 Q1 -∗ is_offer γ2 l P2 Q2 -∗ False. is_offer γ1 l P1 Q1 -∗ is_offer γ2 l P2 Q2 -∗ False.
Proof. Proof.
iDestruct 1 as (?) "[Hl1 _]". iDestruct 1 as (?) "[Hl2 _]". iDestruct 1 as (?) "[Hl1 _]". iDestruct 1 as (?) "[Hl2 _]".
iDestruct (gen_heap.mapsto_valid_2 with "Hl1 Hl2") as %?. contradiction. iDestruct (gen_heap.mapsto_valid_2 with "Hl1 Hl2") as %[??]. contradiction.
Qed. Qed.
Lemma make_is_offer γ l P Q : l #0 -∗ P -∗ is_offer γ l P Q. Lemma make_is_offer γ l P Q : l #0 -∗ P -∗ is_offer γ l P Q.
......
...@@ -170,7 +170,7 @@ Section semtypes_properties. ...@@ -170,7 +170,7 @@ Section semtypes_properties.
iInv (relocN.@"ref".@(l, l1')) as (? ?) "[>Hl ?]" "Hcl". iInv (relocN.@"ref".@(l, l1')) as (? ?) "[>Hl ?]" "Hcl".
iInv (relocN.@"ref".@(l, l2')) as (? ?) "[>Hl' ?]" "Hcl'". iInv (relocN.@"ref".@(l, l2')) as (? ?) "[>Hl' ?]" "Hcl'".
simpl. iExFalso. simpl. iExFalso.
iDestruct (gen_heap.mapsto_valid_2 with "Hl Hl'") as %Hfoo. iDestruct (gen_heap.mapsto_valid_2 with "Hl Hl'") as %[Hfoo _].
compute in Hfoo. eauto. compute in Hfoo. eauto.
Qed. Qed.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment