steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: fix compaction when callback heap has entries in it

db4
Slava Pestov 2009-10-25 00:06:45 -05:00
parent 0c1e266302
commit b6a21b19a9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vm/compaction.cpp
View File

@ -118,14 +118,6 @@ void factor_vm::compact_full_impl(bool trace_contexts_p)
slot_visitor<object_slot_forwarder> slot_forwarder(this,object_slot_forwarder(data_forwarding_map)); slot_visitor<object_slot_forwarder> slot_forwarder(this,object_slot_forwarder(data_forwarding_map));
code_block_visitor<code_block_forwarder> code_forwarder(this,code_block_forwarder(code_forwarding_map)); code_block_visitor<code_block_forwarder> code_forwarder(this,code_block_forwarder(code_forwarding_map));
slot_forwarder.visit_roots();
if(trace_contexts_p)
{
slot_forwarder.visit_contexts();
code_forwarder.visit_context_code_blocks();
code_forwarder.visit_callback_code_blocks();
}
/* Slide everything in tenured space up, and update data and code heap /* Slide everything in tenured space up, and update data and code heap
pointers inside objects. */ pointers inside objects. */
object_compaction_updater object_updater(this,slot_forwarder,code_forwarder,data_forwarding_map); object_compaction_updater object_updater(this,slot_forwarder,code_forwarder,data_forwarding_map);
@ -137,6 +129,14 @@ void factor_vm::compact_full_impl(bool trace_contexts_p)
code_block_compaction_updater code_block_updater(this,slot_forwarder); code_block_compaction_updater code_block_updater(this,slot_forwarder);
standard_sizer<code_block> code_block_sizer; standard_sizer<code_block> code_block_sizer;
code->allocator->compact(code_block_updater,code_block_sizer); code->allocator->compact(code_block_updater,code_block_sizer);
slot_forwarder.visit_roots();
if(trace_contexts_p)
{
slot_forwarder.visit_contexts();
code_forwarder.visit_context_code_blocks();
code_forwarder.visit_callback_code_blocks();
}
} }
} }