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

runtime/vm/isolate.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // 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 VM_ISOLATE_H_
 #define VM_ISOLATE_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/class_table.h"
@@ skipping 40 matching lines @@
 
   // Visit all object pointers.
   void VisitObjectPointers(ObjectPointerVisitor* visitor,
                            bool visit_prologue_weak_persistent_handles,
                            bool validate_frames);
 
   // Visits weak object pointers.
   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_);
   }
 
   Dart_MessageNotifyCallback message_notify_callback() const {
     return message_notify_callback_;
   }
   void set_message_notify_callback(Dart_MessageNotifyCallback value) {
     message_notify_callback_ = value;
@@ skipping 136 matching lines @@
   Isolate();
 
   void BuildName(const char* name_prefix);
   void PrintInvokedFunctions();
 
   static uword GetSpecifiedStackSize();
 
   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_;
   Dart_Port main_port_;
   Heap* heap_;
   ObjectStore* object_store_;
   RawContext* top_context_;
   int32_t random_seed_;
   uword top_exit_frame_info_;
   void* init_callback_data_;
@@ skipping 81 matching lines @@
   Isolate* new_isolate_;
   Isolate* saved_isolate_;
   uword saved_stack_limit_;
 
   DISALLOW_COPY_AND_ASSIGN(SwitchIsolateScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_ISOLATE_H_