Skip to content

Commit

Permalink
Move a chunk of code in order to prevent merge problems.
Browse files Browse the repository at this point in the history
  • Loading branch information
FooBarWidget committed Sep 2, 2009
1 parent 64b1c95 commit cd6e445
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions gc.c
Expand Up @@ -2075,10 +2075,6 @@ garbage_collect_0(VALUE *top_frame)
if (during_gc) return;
during_gc++;

gc_stack_limit = __stack_grow(STACK_END, GC_LEVEL_MAX);
rb_mark_table_prepare();
init_mark_stack();

if (gc_statistics) {
gc_collections++;
gettimeofday(&gctv1, NULL);
Expand All @@ -2087,6 +2083,10 @@ garbage_collect_0(VALUE *top_frame)
}
}

gc_stack_limit = __stack_grow(STACK_END, GC_LEVEL_MAX);
rb_mark_table_prepare();
init_mark_stack();

gc_mark((VALUE)ruby_current_node);

/* mark frame stack */
Expand Down

0 comments on commit cd6e445

Please sign in to comment.