summaryrefslogtreecommitdiff
path: root/rts/Schedule.c
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2008-07-28 15:56:21 +0000
committerSimon Marlow <marlowsd@gmail.com>2008-07-28 15:56:21 +0000
commit02620e7c705ac946db43e61988ca3781af3f2447 (patch)
tree4a65b034fdda5ed683d951a786b56383b1300e77 /rts/Schedule.c
parent4ddcff11bae7e4c66c3c895b277eb8b2230aea67 (diff)
downloadhaskell-02620e7c705ac946db43e61988ca3781af3f2447.tar.gz
Change the calling conventions for unboxed tuples slightly
When returning an unboxed tuple with a single non-void component, we now use the same calling convention as for returning a value of the same type as that component. This means that the return convention for IO now doesn't vary depending on the platform, which make some parts of the RTS simpler, and fixes a problem I was having with making the FFI work in unregisterised GHCi (the byte-code compiler makes some assumptions about calling conventions to keep things simple).
Diffstat (limited to 'rts/Schedule.c')
-rw-r--r--rts/Schedule.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/rts/Schedule.c b/rts/Schedule.c
index c6fb1d885e..96c52f5350 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -1479,9 +1479,7 @@ schedulePostRunThread (StgTSO *t)
throwToSingleThreaded_(&capabilities[0], t,
NULL, rtsTrue, NULL);
-#ifdef REG_R1
ASSERT(get_itbl((StgClosure *)t->sp)->type == ATOMICALLY_FRAME);
-#endif
}
}