- Separate store buffer data in the isolate into the StoreBufferBlock and

runtime/vm/isolate.h

Index: runtime/vm/isolate.h
===================================================================
--- runtime/vm/isolate.h	(revision 9322)
+++ runtime/vm/isolate.h	(working copy)
@@ -58,11 +58,13 @@
   void VisitWeakPersistentHandles(HandleVisitor* visit,
                                   bool visit_prologue_weak_persistent_handles);
 
-  StoreBufferBlock* store_buffer() { return &store_buffer_; }
-  static intptr_t store_buffer_offset() {
-    return OFFSET_OF(Isolate, store_buffer_);
+  StoreBufferBlock* store_buffer_block() { return &store_buffer_block_; }
+  static intptr_t store_buffer_block_offset() {
+    return OFFSET_OF(Isolate, store_buffer_block_);
   }
 
+  StoreBuffer* store_buffer() { return &store_buffer_; }
+
   ClassTable* class_table() { return &class_table_; }
   static intptr_t class_table_offset() {
     return OFFSET_OF(Isolate, class_table_);
@@ -219,7 +221,8 @@
   static const intptr_t kStackSizeBuffer = (16 * KB);
 
   static ThreadLocalKey isolate_key;
-  StoreBufferBlock store_buffer_;
+  StoreBufferBlock store_buffer_block_;
+  StoreBuffer store_buffer_;
   ClassTable class_table_;
   Dart_MessageNotifyCallback message_notify_callback_;
   char* name_;