Commit 042974cc authored by Dan Frumin's avatar Dan Frumin

bump stdpp/iris version

parent ef98c180
...@@ -8,5 +8,5 @@ build: [make "-j%{jobs}%"] ...@@ -8,5 +8,5 @@ build: [make "-j%{jobs}%"]
install: [make "install"] install: [make "install"]
remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/iris-c-monad"] remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/iris-c-monad"]
depends: [ depends: [
"coq-iris" { (= "dev.2019-02-03.0.5fd7dae1") | (= "dev") } "coq-iris" { (= "dev.2019-02-25.0.9b44e889") | (= "dev") }
] ]
...@@ -33,7 +33,7 @@ Section U. ...@@ -33,7 +33,7 @@ Section U.
iIntros "[HP HQ]". rewrite U_eq. iIntros "[HP HQ]". rewrite U_eq.
iDestruct "HP" as (ls1) "[HP1 HP2]". iDestruct "HP" as (ls1) "[HP1 HP2]".
iDestruct "HQ" as (ls2) "[HQ1 HQ2]". iDestruct "HQ" as (ls2) "[HQ1 HQ2]".
iExists (ls1 ls2). iFrame "HP1 HQ1". iExists (ls1 ls2). rewrite !big_sepMS_disj_union. iFrame.
iIntros "[HP1 HQ1]". iSplitL "HP1 HP2". iIntros "[HP1 HQ1]". iSplitL "HP1 HP2".
- by iApply "HP2". - by iApply "HP2".
- by iApply "HQ2". - by iApply "HQ2".
......
...@@ -281,10 +281,9 @@ Section flock. ...@@ -281,10 +281,9 @@ Section flock.
(* We need to guarantee that the new name (* We need to guarantee that the new name
- is not in the set X, - is not in the set X,
- does not clash with the existing names in the invariant *) - does not clash with the existing names in the invariant *)
set (X := collection_map flock_token1_name set (X := set_map flock_token1_name X : gset gname).
X : gset gname). set (X := set_map flock_token2_name
set (X := collection_map flock_token2_name (dom (gset lock_res_gname) (fp from_active fa)) : gset gname).
(dom (gset lock_res_gname) (fp from_active fa)) : gset gname).
iMod (own_alloc_strong (Excl ()) X) as (γt Ht) "T1"; first done. iMod (own_alloc_strong (Excl ()) X) as (γt Ht) "T1"; first done.
iMod (own_alloc_strong (Excl ()) X) as (γt Ht) "T2"; first done. iMod (own_alloc_strong (Excl ()) X) as (γt Ht) "T2"; first done.
......
...@@ -4,7 +4,7 @@ From iris_c.lib Require Import list. ...@@ -4,7 +4,7 @@ From iris_c.lib Require Import list.
Definition is_mset `{heapG Σ} (v : val) (X : gset val) : iProp Σ := Definition is_mset `{heapG Σ} (v : val) (X : gset val) : iProp Σ :=
( (l : loc) hd vs, ( (l : loc) hd vs,
v = #l X = of_list vs is_list hd vs NoDup vs l hd)%I. v = #l X = list_to_set vs is_list hd vs NoDup vs l hd)%I.
Definition mset_create : val := λ: <>, ref (lnil #()). Definition mset_create : val := λ: <>, ref (lnil #()).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment