Commit 2f754628 authored by Ralf Jung's avatar Ralf Jung

do not make use of wp_bind_inv unnecessarily

parent eba7e9e4
...@@ -5,15 +5,15 @@ From iris.heap_lang Require Export tactics lifting. ...@@ -5,15 +5,15 @@ From iris.heap_lang Require Export tactics lifting.
Set Default Proof Using "Type". Set Default Proof Using "Type".
Import uPred. Import uPred.
Lemma tac_wp_pure `{heapG Σ} K Δ Δ' E e1 e2 φ Φ : Lemma tac_wp_pure `{heapG Σ} Δ Δ' E e1 e2 φ Φ :
PureExec φ e1 e2 PureExec φ e1 e2
φ φ
IntoLaterNEnvs 1 Δ Δ' IntoLaterNEnvs 1 Δ Δ'
envs_entails Δ' (WP fill K e2 @ E {{ Φ }}) envs_entails Δ' (WP e2 @ E {{ Φ }})
envs_entails Δ (WP fill K e1 @ E {{ Φ }}). envs_entails Δ (WP e1 @ E {{ Φ }}).
Proof. Proof.
rewrite /envs_entails=> ??? HΔ'. rewrite into_laterN_env_sound /=. rewrite /envs_entails=> ??? HΔ'. rewrite into_laterN_env_sound /=.
rewrite -wp_bind HΔ' -wp_pure_step_later //. by rewrite -wp_bind_inv. rewrite HΔ' -wp_pure_step_later //.
Qed. Qed.
Lemma tac_wp_value `{heapG Σ} Δ E Φ e v : Lemma tac_wp_value `{heapG Σ} Δ E Φ e v :
...@@ -28,11 +28,12 @@ Tactic Notation "wp_pure" open_constr(efoc) := ...@@ -28,11 +28,12 @@ Tactic Notation "wp_pure" open_constr(efoc) :=
lazymatch goal with lazymatch goal with
| |- envs_entails _ (wp ?E ?e ?Q) => reshape_expr e ltac:(fun K e' => | |- envs_entails _ (wp ?E ?e ?Q) => reshape_expr e ltac:(fun K e' =>
unify e' efoc; unify e' efoc;
eapply (tac_wp_pure K); eapply tac_wp_pure;
[simpl; apply _ (* PureExec *) [simpl; change e with (fill K e'); apply _ (* PureExec *)
|try fast_done (* The pure condition for PureExec *) |try fast_done (* The pure condition for PureExec *)
|apply _ (* IntoLaters *) |apply _ (* IntoLaters *)
|simpl_subst; try wp_value_head (* new goal *)]) |simpl_subst; try wp_value_head (* new goal *)
])
|| fail "wp_pure: cannot find" efoc "in" e "or" efoc "is not a reduct" || fail "wp_pure: cannot find" efoc "in" e "or" efoc "is not a reduct"
| _ => fail "wp_pure: not a 'wp'" | _ => fail "wp_pure: not a 'wp'"
end. end.
......
...@@ -140,6 +140,19 @@ Section language. ...@@ -140,6 +140,19 @@ Section language.
PureExec P e1 e2. PureExec P e1 e2.
Proof. intros HPE. split; intros; eapply HPE; eauto. Qed. Proof. intros HPE. split; intros; eapply HPE; eauto. Qed.
Global Instance pure_exec_ctx K `{LanguageCtx Λ K} e1 e2 φ :
PureExec φ e1 e2
PureExec φ (K e1) (K e2).
Proof.
intros [Hred Hstep]. split.
- intros σ ?. destruct (Hred σ) as (? & ? & ? & ?); first done.
do 3 eexists. eapply fill_step. done.
- intros σ ???? Hpstep. edestruct fill_step_inv as (? & ? & ?); [|exact Hpstep|].
+ destruct (Hred σ) as (? & ? & ? & ?); first done.
eapply val_stuck. done.
+ edestruct Hstep as (? & ? & ?); [done..|]. by subst.
Qed.
(* This is a family of frequent assumptions for PureExec *) (* This is a family of frequent assumptions for PureExec *)
Class IntoVal (e : expr Λ) (v : val Λ) := Class IntoVal (e : expr Λ) (v : val Λ) :=
into_val : to_val e = Some v. into_val : to_val e = Some v.
......
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