VM: calls to visit_code_roots() replaced with visit_uninitialized_code_blocks()

diff --git a/vm/code_block_visitor.hpp b/vm/code_block_visitor.hpp
index 6c06d7458925e64556a66a947771278e3eb03f86..c931f3450cdaeaae0b0919a1eb79abbae2d5bb39 100644 (file)
--- a/vm/code_block_visitor.hpp
+++ b/vm/code_block_visitor.hpp
@@ -23,8 +23,6 @@ template <typename Fixup> struct code_block_visitor {
   void visit_embedded_code_pointers(code_block* compiled);
   void visit_context_code_blocks();
   void visit_uninitialized_code_blocks();
-
-  void visit_code_roots();
 };
 
 template <typename Fixup>
@@ -117,8 +115,4 @@ void code_block_visitor<Fixup>::visit_uninitialized_code_blocks() {
   parent->code->uninitialized_blocks = new_uninitialized_blocks;
 }
 
-template <typename Fixup> void code_block_visitor<Fixup>::visit_code_roots() {
-  visit_uninitialized_code_blocks();
-}
-
 }

diff --git a/vm/compaction.cpp b/vm/compaction.cpp
index b9f854fe8b261ca613992b2a47f75df2a0657e6f..18eee437ce3d5de32529cb4d8f0123104232fbdd 100644 (file)
--- a/vm/compaction.cpp
+++ b/vm/compaction.cpp
@@ -198,7 +198,7 @@ void factor_vm::collect_compact_impl(bool trace_contexts_p) {
     slot_visitor<compaction_fixup> data_forwarder(this, fixup);
     code_block_visitor<compaction_fixup> code_forwarder(this, fixup);
 
-    code_forwarder.visit_code_roots();
+    code_forwarder.visit_uninitialized_code_blocks();
 
     /* Object start offsets get recomputed by the object_compaction_updater */
     data->tenured->starts.clear_object_start_offsets();
@@ -291,7 +291,7 @@ void factor_vm::collect_compact_code_impl(bool trace_contexts_p) {
   slot_visitor<code_compaction_fixup> data_forwarder(this, fixup);
   code_block_visitor<code_compaction_fixup> code_forwarder(this, fixup);
 
-  code_forwarder.visit_code_roots();
+  code_forwarder.visit_uninitialized_code_blocks();
 
   if (trace_contexts_p)
     code_forwarder.visit_context_code_blocks();

diff --git a/vm/full_collector.cpp b/vm/full_collector.cpp
index e744af5520cd130c148069b6cc544469d04b93c6..cffbaac710b2de76e7748361c7eaca20ada6fdc9 100644 (file)
--- a/vm/full_collector.cpp
+++ b/vm/full_collector.cpp
@@ -43,7 +43,7 @@ void factor_vm::collect_mark_impl(bool trace_contexts_p) {
   if (trace_contexts_p) {
     collector.data_visitor.visit_contexts();
     collector.code_visitor.visit_context_code_blocks();
-    collector.code_visitor.visit_code_roots();
+    collector.code_visitor.visit_uninitialized_code_blocks();
   }
 
   while (!mark_stack.empty()) {