summaryrefslogtreecommitdiff
path: root/rts/sm
diff options
context:
space:
mode:
authorRyan Newton <rrnewton@gmail.com>2013-08-31 15:28:02 -0400
committerRyan Newton <rrnewton@gmail.com>2013-08-31 15:28:02 -0400
commite251a51a990c3a9c95dabab139d42ad69479f61c (patch)
tree94243fe32bb64d0cab79074ef8de8cb3530d2973 /rts/sm
parent6fd60b2382efa357fe99fa017fd343db9724d43a (diff)
parentea87014a7ad4454f18bb15f6f0ee4b6e61b148be (diff)
downloadhaskell-e251a51a990c3a9c95dabab139d42ad69479f61c.tar.gz
Merge branch 'master' into atomics
Diffstat (limited to 'rts/sm')
-rw-r--r--rts/sm/GC.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index d0446281ab..8bbdda2266 100644
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -47,6 +47,7 @@
#include "RaiseAsync.h"
#include "Papi.h"
#include "Stable.h"
+#include "CheckUnload.h"
#include <string.h> // for memset()
#include <unistd.h>
@@ -661,6 +662,10 @@ GarbageCollect (nat collect_gen,
resetNurseries();
+ if (major_gc) {
+ checkUnload (gct->scavenged_static_objects);
+ }
+
// mark the garbage collected CAFs as dead
#if 0 && defined(DEBUG) // doesn't work at the moment
if (major_gc) { gcCAFs(); }