Merge branch 'CAD-4750-generalise-orelse-frame' into CAD-4738-stm-monad-catch-instance

Author: Yogesh Sajanikar

io-sim/src/Control/Monad/IOSim/Internal.hs

@@ -934,15 +934,15 @@ execAtomically !time !tid !tlbl !nextVid0 action0 k0 =
           k0 $! StmTxBlocked $! (Map.elems read)
 
         BranchFrame (OrElseStmA b) k writtenOuter writtenOuterSeq createdOuterSeq ctl' ->
-          {-# SCC "execAtomically.go.OrElseLeftFrame" #-} do
+          {-# SCC "execAtomically.go.BranchFrame" #-} do
           -- Revert all the TVar writes within this orElse
           !_ <- traverse_ (\(SomeTVar tvar) -> revertTVar tvar) written
           -- Execute the orElse right hand with an empty written set
           let ctl'' = BranchFrame EmptyStmA k writtenOuter writtenOuterSeq createdOuterSeq ctl'
           go ctl'' read Map.empty [] [] nextVid b
 
         BranchFrame _ _k writtenOuter writtenOuterSeq createdOuterSeq ctl' ->
-          {-# SCC "execAtomically.go.OrElseRightFrame" #-} do
+          {-# SCC "execAtomically.go.BranchFrame" #-} do
           -- Revert all the TVar writes within this orElse branch
           !_ <- traverse_ (\(SomeTVar tvar) -> revertTVar tvar) written
           -- Skip the continuation and propagate the retry into the outer frame

io-sim/src/Control/Monad/IOSimPOR/Internal.hs

@@ -1144,15 +1144,15 @@ execAtomically time tid tlbl nextVid0 action0 k0 =
           k0 $! StmTxBlocked $! Map.elems read
 
         BranchFrame (OrElseStmA b) k writtenOuter writtenOuterSeq createdOuterSeq ctl' ->
-          {-# SCC "execAtomically.go.OrElseLeftFrame" #-} do
+          {-# SCC "execAtomically.go.BranchFrame" #-} do
           -- Revert all the TVar writes within this orElse
           !_ <- traverse_ (\(SomeTVar tvar) -> revertTVar tvar) written
           -- Execute the orElse right hand with an empty written set
           let ctl'' = BranchFrame EmptyStmA  k writtenOuter writtenOuterSeq createdOuterSeq ctl'
           go ctl'' read Map.empty [] [] nextVid b
 
         BranchFrame _ _k writtenOuter writtenOuterSeq createdOuterSeq ctl' ->
-          {-# SCC "execAtomically.go.OrElseRightFrame" #-} do
+          {-# SCC "execAtomically.go.BranchFrame" #-} do
           -- Revert all the TVar writes within this orElse branch
           !_ <- traverse_ (\(SomeTVar tvar) -> revertTVar tvar) written
           -- Skip the continuation and propagate the retry into the outer frame