summaryrefslogtreecommitdiff
path: root/rts/Schedule.c
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2009-10-14 13:17:27 +0000
committerSimon Marlow <marlowsd@gmail.com>2009-10-14 13:17:27 +0000
commit0856ac59cfb455d32a3042317fdba0f5e85cab9c (patch)
treee744d0c909780dabeffa65babfb9c4535f9a4d0a /rts/Schedule.c
parentc5f93af1c663ab68f3b18f6a8c3264165a1c8883 (diff)
downloadhaskell-0856ac59cfb455d32a3042317fdba0f5e85cab9c.tar.gz
micro-opt: replace stmGetEnclosingTRec() with a field access
While fixing #3578 I noticed that this function was just a field access to StgTRecHeader, so I inlined it manually.
Diffstat (limited to 'rts/Schedule.c')
-rw-r--r--rts/Schedule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/rts/Schedule.c b/rts/Schedule.c
index 9b261cf660..302ec1e7a5 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);