make it work with reactive-banana again

ghcjs · Oct 17, 2015 · 7031380 · 7031380
1 parent 4e76e31
commit 7031380
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/gc.js b/src/gc.js
@@ -306,13 +306,16 @@ function h$markRetained() {
         }
 
         TRACE_GC("mark retained iteration 2/2");
-        if(w.val !== null) {
-            w.val = null;
-        }
-        if(w.finalizer !== null && !IS_MARKED(w.finalizer)) {
-            TRACE_GC("following finalizer");
-            h$follow(w.finalizer);
-            toFinalize.push(w);
+        if (IS_MARKED(w)) {
+            if(w.val !== null) {
+                w.val = null;
+            }
+            if(w.finalizer !== null) {
+                TRACE_GC("following finalizer");
+                if (!IS_MARKED(w.finalizer))
+                    h$follow(w.finalizer);
+                toFinalize.push(w);
+            }
         }
     }
 
@@ -416,8 +419,6 @@ function h$follow(obj, sp) {
                     TRACE_GC("adding static marks");
                     for(var i=0;i<s.length;i++) ADDW(s[i]);
                 }
-            } else if(c instanceof h$Weak) {
-                MARK_OBJ(c);
             } else if(c instanceof h$MVar) {
                 TRACE_GC("marking MVar");
                 MARK_OBJ(c);