[vm, gc] Rename store_buffer.h as pointer_block.h as it also defines the mark stack blocks.

rmacnak-google · rmacnak-google · commit ac69a3041aeb · 2018-08-07T23:49:14.000Z
Bug: dart-lang/sdk#34002 Change-Id: I85ce8c639bbbfc9167c7c5462ff8756a81ecf3d3 Reviewed-on: https://dart-review.googlesource.com/68841 Reviewed-by: Zach Anderson <zra@google.com> Reviewed-by: Siva Annamalai <asiva@google.com>
diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc
@@ -15,7 +15,7 @@
 #include "vm/heap/become.h"
 #include "vm/heap/freelist.h"
 #include "vm/heap/heap.h"
-#include "vm/heap/store_buffer.h"
+#include "vm/heap/pointer_block.h"
 #include "vm/isolate.h"
 #include "vm/kernel_isolate.h"
 #include "vm/malloc_hooks.h"
diff --git a/runtime/vm/heap/heap_sources.gni b/runtime/vm/heap/heap_sources.gni
@@ -17,13 +17,13 @@ heap_sources = [
   "marker.h",
   "pages.cc",
   "pages.h",
+  "pointer_block.cc",
+  "pointer_block.h",
   "safepoint.cc",
   "safepoint.h",
   "scavenger.cc",
   "scavenger.h",
   "spaces.h",
-  "store_buffer.cc",
-  "store_buffer.h",
   "sweeper.cc",
   "sweeper.h",
   "verifier.cc",
diff --git a/runtime/vm/heap/marker.cc b/runtime/vm/heap/marker.cc
@@ -7,7 +7,7 @@
 #include "vm/allocation.h"
 #include "vm/dart_api_state.h"
 #include "vm/heap/pages.h"
-#include "vm/heap/store_buffer.h"
+#include "vm/heap/pointer_block.h"
 #include "vm/isolate.h"
 #include "vm/log.h"
 #include "vm/object_id_ring.h"
diff --git a/runtime/vm/heap/pointer_block.cc b/runtime/vm/heap/pointer_block.cc
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#include "vm/heap/store_buffer.h"
+#include "vm/heap/pointer_block.h"
 
 #include "platform/assert.h"
 #include "vm/lockers.h"
diff --git a/runtime/vm/heap/pointer_block.h b/runtime/vm/heap/pointer_block.h
@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef RUNTIME_VM_HEAP_STORE_BUFFER_H_
-#define RUNTIME_VM_HEAP_STORE_BUFFER_H_
+#ifndef RUNTIME_VM_HEAP_POINTER_BLOCK_H_
+#define RUNTIME_VM_HEAP_POINTER_BLOCK_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
@@ -173,6 +173,8 @@ class MarkingStack : public BlockStack<kMarkingStackBlockSize> {
   }
 };
 
+typedef MarkingStack::Block MarkingStackBlock;
+
 }  // namespace dart
 
-#endif  // RUNTIME_VM_HEAP_STORE_BUFFER_H_
+#endif  // RUNTIME_VM_HEAP_POINTER_BLOCK_H_
diff --git a/runtime/vm/heap/scavenger.cc b/runtime/vm/heap/scavenger.cc
@@ -7,8 +7,8 @@
 #include "vm/dart.h"
 #include "vm/dart_api_state.h"
 #include "vm/flag_list.h"
+#include "vm/heap/pointer_block.h"
 #include "vm/heap/safepoint.h"
-#include "vm/heap/store_buffer.h"
 #include "vm/heap/verifier.h"
 #include "vm/heap/weak_table.h"
 #include "vm/isolate.h"
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
@@ -20,8 +20,8 @@
 #include "vm/deopt_instructions.h"
 #include "vm/flags.h"
 #include "vm/heap/heap.h"
+#include "vm/heap/pointer_block.h"
 #include "vm/heap/safepoint.h"
-#include "vm/heap/store_buffer.h"
 #include "vm/heap/verifier.h"
 #include "vm/image_snapshot.h"
 #include "vm/interpreter.h"
diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h
@@ -13,7 +13,7 @@
 #include "vm/constants.h"
 #include "vm/globals.h"
 #include "vm/handles.h"
-#include "vm/heap/store_buffer.h"
+#include "vm/heap/pointer_block.h"
 #include "vm/os_thread.h"
 #include "vm/runtime_entry_list.h"
 
