Merge branch 'yyc/gc-debug'

JuliaLang · Aug 13, 2015 · 24a92a9 · 24a92a9
2 parents c61cd8b + 7477992
commit 24a92a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/gc-debug.c b/src/gc-debug.c
@@ -338,6 +338,8 @@ static void gc_scrub_range(char *stack_lo, char *stack_hi)
         jl_taggedvalue_t *tag = jl_gc_find_taggedvalue_pool(p, &osize);
         if (!tag || gc_marked(tag) || osize <= sizeof_jl_taggedvalue_t)
             continue;
+        // Make sure the sweep rebuild the freelist
+        page_metadata(tag)->allocd = 1;
         memset(tag, 0xff, osize);
     }
 }

diff --git a/src/gc.c b/src/gc.c
@@ -2086,8 +2086,8 @@ void jl_gc_collect(int full)
 #endif
             estimate_freed = live_bytes - scanned_bytes - perm_scanned_bytes + actual_allocd;
 
-            gc_scrub(stack_hi);
             gc_verify();
+            gc_scrub(stack_hi);
 
 #if defined(MEMPROFILE)
             all_pool_stats();