X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FSchedule.c;h=302ec1e7a546e82fd3b319cca90760c18ace843c;hp=9b261cf66012365976197389546848f3f2366a2f;hb=0856ac59cfb455d32a3042317fdba0f5e85cab9c;hpb=a5288c551349a0adab0d931a429b10a096d9444d

diff --git a/rts/Schedule.c b/rts/Schedule.c
index 9b261cf..302ec1e 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -1062,7 +1062,7 @@ schedulePostRunThread (Capability *cap, StgTSO *t)
             // partially-evaluated thunks on the heap.
             throwToSingleThreaded_(cap, t, NULL, rtsTrue);
             
-            ASSERT(get_itbl((StgClosure *)t->sp)->type == ATOMICALLY_FRAME);
+//            ASSERT(get_itbl((StgClosure *)t->sp)->type == ATOMICALLY_FRAME);
         }
     }
 
@@ -2564,7 +2564,7 @@ findRetryFrameHelper (StgTSO *tso)
       
     case CATCH_STM_FRAME: {
         StgTRecHeader *trec = tso -> trec;
-	StgTRecHeader *outer = stmGetEnclosingTRec(trec);
+	StgTRecHeader *outer = trec -> enclosing_trec;
         debugTrace(DEBUG_stm,
 		   "found CATCH_STM_FRAME at %p during retry", p);
         debugTrace(DEBUG_stm, "trec=%p outer=%p", trec, outer);