summaryrefslogtreecommitdiff
path: root/rts/Task.c
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2010-05-05 11:49:47 +0000
committerSimon Marlow <marlowsd@gmail.com>2010-05-05 11:49:47 +0000
commit497f8aa6c2c8770daf3d39f57ee5e04dcdcc3778 (patch)
tree977b2376b794783041e795ee69f69765bf86ca86 /rts/Task.c
parent7f148c3265edb930223f50c3702e33bc51f00bd1 (diff)
downloadhaskell-497f8aa6c2c8770daf3d39f57ee5e04dcdcc3778.tar.gz
Make the running_finalizers flag task-local
Fixes a bug reported by Lennart Augustsson, whereby we could get an incorrect error from the RTS about re-entry from a finalizer,
Diffstat (limited to 'rts/Task.c')
-rw-r--r--rts/Task.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/rts/Task.c b/rts/Task.c
index 9707251ca3..98f083c112 100644
--- a/rts/Task.c
+++ b/rts/Task.c
@@ -153,6 +153,7 @@ newTask (rtsBool worker)
task->cap = NULL;
task->worker = worker;
task->stopped = rtsFalse;
+ task->running_finalizers = rtsFalse;
task->stat = NoStatus;
task->ret = NULL;
task->n_spare_incalls = 0;