X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsAPI.c;h=2479f2038a4b501aad09cec9db172dfaf4078e2b;hb=661c97c65e5fa47177502e592bb763f752b487ac;hp=c4babca4e8e5ca80b8c4ba5641ed3ede76595003;hpb=5270423a6afe69f1dc57e5e5a474812182718d40;p=ghc-hetmet.git diff --git a/rts/RtsAPI.c b/rts/RtsAPI.c index c4babca..2479f20 100644 --- a/rts/RtsAPI.c +++ b/rts/RtsAPI.c @@ -538,16 +538,16 @@ rts_lock (void) Capability *cap; Task *task; - if (running_finalizers) { + task = newBoundTask(); + + if (task->running_finalizers) { errorBelch("error: a C finalizer called back into Haskell.\n" " This was previously allowed, but is disallowed in GHC 6.10.2 and later.\n" - " To create finalizers that may call back into Haskll, use\n" + " To create finalizers that may call back into Haskell, use\n" " Foreign.Concurrent.newForeignPtr instead of Foreign.newForeignPtr."); stg_exit(EXIT_FAILURE); } - task = newBoundTask(); - cap = NULL; waitForReturnCapability(&cap, task); return (Capability *)cap;