@@ -379,18 +379,17 @@ index 45facf0..933b76e 100644 #define HEAP_MIN_SLOTS 10000 static int heap_slots = HEAP_MIN_SLOTS; -@@ -442,6 +463,11 @@ rb_newobj() +@@ -438,10 +438,8 @@ rb_newobj() + obj = (VALUE)freelist; + freelist = freelist->as.free.next; + MEMZERO((void*)obj, RVALUE, 1); +-#ifdef GC_DEBUG RANY(obj)->file = ruby_sourcefile; RANY(obj)->line = ruby_sourceline; - #endif -+ -+ if (ruby_current_node && ruby_current_node->nd_file) { -+ RANY(obj)->file = ruby_current_node->nd_file; -+ RANY(obj)->line = nd_line(ruby_current_node); -+ } +-#endif return obj; } - + @@ -678,6 +704,9 @@ mark_locations_array(x, n) register long n; { @@ -420,6 +419,28 @@ index 45facf0..933b76e 100644 if (lev > GC_LEVEL_MAX || (lev == 0 && ruby_stack_check())) { if (!mark_stack_overflow) { if (mark_stack_ptr - mark_stack < MARK_STACK_MAX) { +@@ -1077,6 +1078,10 @@ gc_mark(ptr, lev) + if (obj->as.basic.flags == 0) return; /* free cell */ + if (obj->as.basic.flags & FL_MARK) return; /* already marked */ + obj->as.basic.flags |= FL_MARK; ++ ++ /* mark our new reference point for sourcefile objects */ ++ mark_source_filename(RANY(obj)->file); ++ + + if (lev > GC_LEVEL_MAX || (lev == 0 && ruby_stack_check())) { + if (!mark_stack_overflow) { +@@ -1115,6 +1120,10 @@ gc_mark_children(ptr, lev) + if (obj->as.basic.flags == 0) return; /* free cell */ + if (obj->as.basic.flags & FL_MARK) return; /* already marked */ + obj->as.basic.flags |= FL_MARK; ++ ++ /* mark our new reference point for sourcefile objects */ ++ mark_source_filename(RANY(obj)->file); ++ + + marking: + if (FL_TEST(obj, FL_EXIVAR)) { diff --git a/parse.c b/parse.c index 6b3d80d..b320cf2 100644 --- a/parse.c ruby/ruby-1.8.7.patch 4b629fb97e410d3f64cc50408c1937d5803d7e4c Evan Weaver eweaver@twitter.com http://github.com/fauna/bleak_house/commit/1e2ddb637989da1594367fdb5350aa44708196d8 1e2ddb637989da1594367fdb5350aa44708196d8 2009-09-02T22:48:44-07:00 2009-09-02T22:48:44-07:00 Slight update to patch. e883e2e5c185c8209fd0d7580ac0dd639988fdb0 Evan Weaver eweaver@twitter.com