X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FWeak.c;h=17150f6b3cc7357d04aee573cb3a1d3d04bb9530;hb=2c8d42f32022f4950606d75d53e45a4c30d210df;hp=a50a72e59cd4bf56152ea6e766b6e6c7a7d201e1;hpb=6c095bfa3c8c81b52ad92853acd326453d320d7b;p=ghc-hetmet.git

diff --git a/rts/Weak.c b/rts/Weak.c
index a50a72e..17150f6 100644
--- a/rts/Weak.c
+++ b/rts/Weak.c
@@ -22,6 +22,9 @@
 
 StgWeak *weak_ptr_list;
 
+// So that we can detect when a finalizer illegally calls back into Haskell
+rtsBool running_finalizers = rtsFalse;
+
 void
 runCFinalizer(StgVoid *fn, StgVoid *ptr, StgVoid *env, StgWord flag)
 {
@@ -36,6 +39,8 @@ runAllCFinalizers(StgWeak *list)
 {
     StgWeak *w;
 
+    running_finalizers = rtsTrue;
+
     for (w = list; w; w = w->link) {
 	StgArrWords *farr;
 
@@ -47,6 +52,8 @@ runAllCFinalizers(StgWeak *list)
 	                  (StgVoid *)farr->payload[2],
 	                  farr->payload[3]);
     }
+
+    running_finalizers = rtsFalse;
 }
 
 /*
@@ -72,6 +79,8 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
     StgMutArrPtrs *arr;
     nat n;
 
+    running_finalizers = rtsTrue;
+
     // count number of finalizers, and kill all the weak pointers first...
     n = 0;
     for (w = list; w; w = w->link) { 
@@ -105,6 +114,8 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
 	SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs);
     }
 	
+    running_finalizers = rtsFalse;
+
     // No finalizers to run?
     if (n == 0) return;