Remove some weird uses of wp_atomic.

F_mu_ref/fundamental.v

@@ -88,17 +88,13 @@ Section fundamental.
       iNext; iPvsIntro. by rewrite -interp_subst.
     - (* Alloc *)
       smart_wp_bind AllocCtx v "#Hv" IHtyped; cbn. iClear "HΓ".
-      iApply wp_atomic; cbn; trivial; [rewrite to_of_val; auto|].
-      iPvsIntro.
       iApply wp_alloc; auto 1 using to_of_val.
-      iFrame "Hheap". iNext. iIntros {l} "Hl". iPvsIntro.
+      iIntros "{$Hheap} >"; iIntros {l} "Hl".
       iPvs (inv_alloc _ with "[Hl]") as "HN";
         [| | iPvsIntro; iExists _; iSplit; trivial]; eauto.
     - (* Load *)
       smart_wp_bind LoadCtx v "#Hv" IHtyped; cbn. iClear "HΓ".
       iDestruct "Hv" as {l} "[% #Hv]"; subst.
-      iApply wp_atomic; cbn; eauto using to_of_val.
-      iPvsIntro.
       iInv (logN .@ l) as {w} "[Hw1 #Hw2]".
       iApply (wp_load _ _ 1); [|iFrame "Hheap"]; trivial. solve_ndisj.
       iIntros "{$Hw1} > Hw1". iPvsIntro. iSplitL; eauto.
@@ -106,12 +102,8 @@ Section fundamental.
       smart_wp_bind (StoreLCtx _) v "#Hv" IHtyped1; cbn.
       smart_wp_bind (StoreRCtx _) w "#Hw" IHtyped2; cbn. iClear "HΓ".
       iDestruct "Hv" as {l} "[% #Hv]"; subst.
-      iApply wp_atomic; cbn; [trivial| rewrite ?to_of_val; auto |].
-      iPvsIntro.
-      iInv (logN .@ l) as {z} "[Hz1 #Hz2]".
-      eapply bool_decide_spec; eauto using to_of_val.
+      iInv (logN .@ l) as {z} "[Hz1 #Hz2]"; [cbn; eauto 10 using to_of_val|].
       iApply wp_store; auto using to_of_val. solve_ndisj.
-      iIntros "{$Hheap $Hz1} > Hz1". iPvsIntro.
-      iSplitL; eauto 10.
+      iIntros "{$Hheap $Hz1} > Hz1". iPvsIntro; iSplitL; eauto 10.
   Qed.
 End fundamental.

F_mu_ref_par/fundamental_unary.v

@@ -107,18 +107,13 @@ Section typed_interp.
       iApply wp_wand_l. iSplitL; [|iApply IHtyped; auto]; auto.
     - (* Alloc *)
       smart_wp_bind AllocCtx v "#Hv" IHtyped; cbn. iClear "HΓ".
-      iApply wp_atomic; cbn; trivial; [rewrite to_of_val; auto|].
-      iPvsIntro.
       iApply wp_alloc; auto 1 using to_of_val.
-      iFrame "Hheap". iNext.
-      iIntros {l} "Hl". iPvsIntro.
+      iIntros "{$Hheap} >"; iIntros {l} "Hl".
       iPvs (inv_alloc _ with "[Hl]") as "HN";
         [| | iPvsIntro; iExists _; iSplit; trivial]; eauto.
     - (* Load *)
       smart_wp_bind LoadCtx v "#Hv" IHtyped; cbn. iClear "HΓ".
-      iDestruct "Hv" as {l} "[% #Hv]"; subst.
-      iApply wp_atomic; cbn; eauto using to_of_val.
-      iPvsIntro.
+      iDestruct "Hv" as {l} "[% #Hv]"; subst; simpl.
       iInv (logN .@ l) as {w} "[Hw1 #Hw2]".
       iApply (wp_load _ _ 1); [|iFrame "Hheap"]; trivial. solve_ndisj.
       iIntros "{$Hw1} > Hw1". iPvsIntro; iSplitL; eauto.
@@ -126,10 +121,7 @@ Section typed_interp.
       smart_wp_bind (StoreLCtx _) v "#Hv" IHtyped1; cbn.
       smart_wp_bind (StoreRCtx _) w "#Hw" IHtyped2; cbn. iClear "HΓ".
       iDestruct "Hv" as {l} "[% #Hv]"; subst.
-      iApply wp_atomic; cbn; [trivial| rewrite ?to_of_val; auto |].
-      iPvsIntro.
-      iInv (logN .@ l) as {z} "[Hz1 #Hz2]".
-      eapply bool_decide_spec; eauto using to_of_val.
+      iInv (logN .@ l) as {z} "[Hz1 #Hz2]"; [cbn; eauto 10 using to_of_val|].
       iApply wp_store; auto using to_of_val. solve_ndisj.
       iIntros "{$Hheap $Hz1} > Hz1". iPvsIntro. iSplitL; eauto 10.
     - (* CAS *)
@@ -137,14 +129,11 @@ Section typed_interp.
       smart_wp_bind (CasMCtx _ _) v2 "#Hv2" IHtyped2; cbn.
       smart_wp_bind (CasRCtx _ _) v3 "#Hv3" IHtyped3; cbn. iClear "HΓ".
       iDestruct "Hv1" as {l} "[% Hinv]"; subst.
-      iApply wp_atomic; cbn; eauto 10 using to_of_val.
-      iPvsIntro.
       iInv (logN .@ l) as {w} "[Hw1 #Hw2]"; [cbn; eauto 10 using to_of_val|].
       destruct (decide (v2 = w)) as [|Hneq]; subst.
       + iApply wp_cas_suc; eauto using to_of_val. solve_ndisj.
-        iIntros "{$Hheap $Hw1} > Hw1"; iPvsIntro.
-        iSplitL; [|iPvsIntro]; eauto.
+        iIntros "{$Hheap $Hw1} > Hw1"; iPvsIntro; iSplitL; eauto.
       + iApply wp_cas_fail; eauto using to_of_val. solve_ndisj.
-        iIntros "{$Hheap $Hw1} > Hw1". iPvsIntro. iSplitL; eauto.
+        iIntros "{$Hheap $Hw1} > Hw1"; iPvsIntro; iSplitL; eauto.
   Qed.
 End typed_interp.