update one_shot_once

tests/one_shot_once.ref

@@ -35,5 +35,9 @@
   "Hγ" : own γ (Shot m')
   --------------------------------------∗
   |={⊤ ∖ ↑N}=> ▷ one_shot_inv γ l
-               ∗ WP InjRV #m = InjRV #m' {{ v, ⌜v = #true⌝ ∧ ▷ True }}
+               ∗ WP let: "y'" := InjRV #m' in
+                    match: InjRV #m with
+                      InjL <> => #()
+                    | InjR <> => assert: InjRV #m = "y'"
+                    end {{ _, True }}
   

tests/one_shot_once.v

@@ -15,9 +15,10 @@ Definition one_shot_example : val := λ: <>,
     assert: CAS "x" NONE (SOME "n")),
   (* check  *) (λ: <>,
     let: "y" := !"x" in λ: <>,
+      let: "y'" := !"x" in
       match: "y" with
         NONE => #()
-    | SOME <> => assert: "y" = !"x"
+      | SOME <> => assert: "y" = "y'"
       end)).
 
 Definition one_shotR := csumR fracR (agreeR ZO).
@@ -37,6 +38,8 @@ Definition one_shot_inv (γ : gname) (l : loc) : iProp Σ :=
   (l ↦ NONEV ∗ own γ (Pending (1/2)%Qp) ∨
    ∃ n : Z, l ↦ SOMEV #n ∗ own γ (Shot n))%I.
 
+Local Hint Extern 0 (environments.envs_entails _ (one_shot_inv _ _)) => unfold one_shot_inv.
+
 Lemma pending_split γ q :
   own γ (Pending q) ⊣⊢ own γ (Pending (q/2)) ∗ own γ (Pending (q/2)).
 Proof.
@@ -86,17 +89,18 @@ Proof.
       + Show. iSplit. iLeft; by iSplitL "Hl". eauto.
       + iSplit. iRight; iExists m; by iSplitL "Hl". eauto. }
     iSplitL "Hinv"; first by eauto.
-    iModIntro. wp_pures. iIntros "!#". wp_lam.
-    iDestruct "Hv" as "[%|Hv]"; last iDestruct "Hv" as (m) "[% Hγ']";
-      subst; wp_match; [done|].
-    wp_pures. iApply wp_assert. wp_bind (! _)%E.
-    iInv N as "[[Hl >Hγ]|H]"; last iDestruct "H" as (m') "[Hl Hγ]".
+    iModIntro. wp_pures. iIntros "!#". wp_lam. wp_bind (! _)%E.
+    iInv N as "Hinv".
+    iDestruct "Hv" as "[%|Hv]"; last iDestruct "Hv" as (m) "[% Hγ']"; subst.
+    + iDestruct "Hinv" as "[[Hl >Hγ]|H]"; last iDestruct "H" as (m') "[Hl Hγ]";
+      wp_load; iModIntro; (iSplitL "Hl Hγ"; first by eauto with iFrame);
+      wp_pures; done.
+    + iDestruct "Hinv" as "[[Hl >Hγ]|H]"; last iDestruct "H" as (m') "[Hl Hγ]".
       { by iDestruct (own_valid_2 with "Hγ Hγ'") as %?. }
       wp_load. Show.
       iDestruct (own_valid_2 with "Hγ Hγ'") as %?%agree_op_invL'; subst.
-    iModIntro. iSplitL "Hl".
-    { iNext; iRight; by eauto. }
-    wp_pures. by case_bool_decide.
+      iModIntro. iSplitL "Hl Hγ"; first by eauto with iFrame.
+      wp_pures. iApply wp_assert. wp_op. by case_bool_decide.
 Qed.
 
 Lemma ht_one_shot (Φ : val → iProp Σ) :