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

bump Iris

parent af0379d5
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -11,5 +11,5 @@ build: [make "-j%{jobs}%"] ...@@ -11,5 +11,5 @@ build: [make "-j%{jobs}%"]
install: [make "install"] install: [make "install"]
remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/lrust'" ] remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/lrust'" ]
depends: [ depends: [
"coq-iris" { (= "dev.2018-02-09.0") | (= "dev") } "coq-iris" { (= "dev.2018-02-20.1") | (= "dev") }
] ]
...@@ -17,7 +17,7 @@ Ltac wp_value_head := eapply tac_wp_value; [apply _|lazy beta]. ...@@ -17,7 +17,7 @@ Ltac wp_value_head := eapply tac_wp_value; [apply _|lazy beta].
Lemma tac_wp_pure `{lrustG Σ} K Δ Δ' E e1 e2 φ Φ : Lemma tac_wp_pure `{lrustG Σ} K Δ Δ' E e1 e2 φ Φ :
PureExec φ e1 e2 PureExec φ e1 e2
φ φ
IntoLaterNEnvs 1 Δ Δ' MaybeIntoLaterNEnvs 1 Δ Δ'
envs_entails Δ' (WP fill K e2 @ E {{ Φ }}) envs_entails Δ' (WP fill K e2 @ E {{ Φ }})
envs_entails Δ (WP fill K e1 @ E {{ Φ }}). envs_entails Δ (WP fill K e1 @ E {{ Φ }}).
Proof. Proof.
...@@ -40,7 +40,7 @@ Tactic Notation "wp_pure" open_constr(efoc) := ...@@ -40,7 +40,7 @@ Tactic Notation "wp_pure" open_constr(efoc) :=
end. end.
Lemma tac_wp_eq_loc `{lrustG Σ} K Δ Δ' E i1 i2 l1 l2 q1 q2 v1 v2 Φ : Lemma tac_wp_eq_loc `{lrustG Σ} K Δ Δ' E i1 i2 l1 l2 q1 q2 v1 v2 Φ :
IntoLaterNEnvs 1 Δ Δ' MaybeIntoLaterNEnvs 1 Δ Δ'
envs_lookup i1 Δ' = Some (false, l1 {q1} v1)%I envs_lookup i1 Δ' = Some (false, l1 {q1} v1)%I
envs_lookup i2 Δ' = Some (false, l2 {q2} v2)%I envs_lookup i2 Δ' = Some (false, l2 {q2} v2)%I
envs_entails Δ' (WP fill K (Lit (bool_decide (l1 = l2))) @ E {{ Φ }}) envs_entails Δ' (WP fill K (Lit (bool_decide (l1 = l2))) @ E {{ Φ }})
...@@ -97,7 +97,7 @@ Implicit Types Δ : envs (iResUR Σ). ...@@ -97,7 +97,7 @@ Implicit Types Δ : envs (iResUR Σ).
Lemma tac_wp_alloc K Δ Δ' E j1 j2 n Φ : Lemma tac_wp_alloc K Δ Δ' E j1 j2 n Φ :
0 < n 0 < n
IntoLaterNEnvs 1 Δ Δ' MaybeIntoLaterNEnvs 1 Δ Δ'
( l (sz: nat), n = sz Δ'', ( l (sz: nat), n = sz Δ'',
envs_app false (Esnoc (Esnoc Enil j1 (l ↦∗ repeat (LitV LitPoison) sz)) j2 (lsz)) Δ' envs_app false (Esnoc (Esnoc Enil j1 (l ↦∗ repeat (LitV LitPoison) sz)) j2 (lsz)) Δ'
= Some Δ'' = Some Δ''
...@@ -116,7 +116,7 @@ Qed. ...@@ -116,7 +116,7 @@ Qed.
Lemma tac_wp_free K Δ Δ' Δ'' Δ''' E i1 i2 vl (n : Z) (n' : nat) l Φ : Lemma tac_wp_free K Δ Δ' Δ'' Δ''' E i1 i2 vl (n : Z) (n' : nat) l Φ :
n = length vl n = length vl
IntoLaterNEnvs 1 Δ Δ' MaybeIntoLaterNEnvs 1 Δ Δ'
envs_lookup i1 Δ' = Some (false, l ↦∗ vl)%I envs_lookup i1 Δ' = Some (false, l ↦∗ vl)%I
envs_delete i1 false Δ' = Δ'' envs_delete i1 false Δ' = Δ''
envs_lookup i2 Δ'' = Some (false, ln')%I envs_lookup i2 Δ'' = Some (false, ln')%I
...@@ -133,7 +133,7 @@ Qed. ...@@ -133,7 +133,7 @@ Qed.
Lemma tac_wp_read K Δ Δ' E i l q v o Φ : Lemma tac_wp_read K Δ Δ' E i l q v o Φ :
o = Na1Ord o = ScOrd o = Na1Ord o = ScOrd
IntoLaterNEnvs 1 Δ Δ' MaybeIntoLaterNEnvs 1 Δ Δ'
envs_lookup i Δ' = Some (false, l {q} v)%I envs_lookup i Δ' = Some (false, l {q} v)%I
envs_entails Δ' (WP fill K (of_val v) @ E {{ Φ }}) envs_entails Δ' (WP fill K (of_val v) @ E {{ Φ }})
envs_entails Δ (WP fill K (Read o (Lit $ LitLoc l)) @ E {{ Φ }}). envs_entails Δ (WP fill K (Read o (Lit $ LitLoc l)) @ E {{ Φ }}).
...@@ -150,7 +150,7 @@ Qed. ...@@ -150,7 +150,7 @@ Qed.
Lemma tac_wp_write K Δ Δ' Δ'' E i l v e v' o Φ : Lemma tac_wp_write K Δ Δ' Δ'' E i l v e v' o Φ :
IntoVal e v' IntoVal e v'
o = Na1Ord o = ScOrd o = Na1Ord o = ScOrd
IntoLaterNEnvs 1 Δ Δ' MaybeIntoLaterNEnvs 1 Δ Δ'
envs_lookup i Δ' = Some (false, l v)%I envs_lookup i Δ' = Some (false, l v)%I
envs_simple_replace i false (Esnoc Enil i (l v')) Δ' = Some Δ'' envs_simple_replace i false (Esnoc Enil i (l v')) Δ' = Some Δ''
envs_entails Δ'' (WP fill K (Lit LitPoison) @ E {{ Φ }}) envs_entails Δ'' (WP fill K (Lit LitPoison) @ E {{ Φ }})
......
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