From 1fc48b88942c9175f905401b3a96a06730f92415 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 9 Oct 2009 09:47:54 -0500 Subject: [PATCH] vm: remove old_data_heap from gc_state --- vm/full_collector.cpp | 9 +++++---- vm/gc.hpp | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vm/full_collector.cpp b/vm/full_collector.cpp index 15a76590f1..dd142a2cb0 100644 --- a/vm/full_collector.cpp +++ b/vm/full_collector.cpp @@ -95,13 +95,15 @@ void full_collector::cheneys_algorithm() void factor_vm::collect_full(cell requested_bytes, bool trace_contexts_p) { + data_heap *old; if(current_gc->growing_data_heap) { - current_gc->old_data_heap = data; - set_data_heap(grow_data_heap(current_gc->old_data_heap,requested_bytes)); + old = data; + set_data_heap(grow_data_heap(data,requested_bytes)); } else { + old = NULL; std::swap(data->tenured,data->tenured_semispace); reset_generation(data->tenured); } @@ -121,8 +123,7 @@ void factor_vm::collect_full(cell requested_bytes, bool trace_contexts_p) reset_generation(data->aging); nursery.here = nursery.start; - if(current_gc->growing_data_heap) - delete current_gc->old_data_heap; + if(old) delete old; } } diff --git a/vm/gc.hpp b/vm/gc.hpp index d95d8df833..02f54414fd 100755 --- a/vm/gc.hpp +++ b/vm/gc.hpp @@ -24,7 +24,6 @@ struct gc_state { /* sometimes we grow the heap */ bool growing_data_heap; - data_heap *old_data_heap; /* Which generation is being collected */ cell collecting_gen;