X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FRtsAPI.c;h=2479f2038a4b501aad09cec9db172dfaf4078e2b;hp=6e6621841ee0cad7a9124858e142a15a69fbc14e;hb=497f8aa6c2c8770daf3d39f57ee5e04dcdcc3778;hpb=7f148c3265edb930223f50c3702e33bc51f00bd1 diff --git a/rts/RtsAPI.c b/rts/RtsAPI.c index 6e66218..2479f20 100644 --- a/rts/RtsAPI.c +++ b/rts/RtsAPI.c @@ -538,7 +538,9 @@ 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 Haskell, use\n" @@ -546,8 +548,6 @@ rts_lock (void) stg_exit(EXIT_FAILURE); } - task = newBoundTask(); - cap = NULL; waitForReturnCapability(&cap, task); return (Capability *)cap;