- Tighten assertions around store buffers.

runtime/vm/object.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_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 361 matching lines @@
   void set_vtable(cpp_vtable value) { *vtable_address() = value; }
 
   static RawObject* Allocate(const Class& cls,
                              intptr_t size,
                              Heap::Space space);
 
   static intptr_t RoundedAllocationSize(intptr_t size) {
     return Utils::RoundUp(size, kObjectAlignment);
   }
 
+  bool Contains(uword addr) const {
+    intptr_t this_size = raw()->Size();
+    uword this_addr = RawObject::ToAddr(raw());
+    return (addr >= this_addr) && (addr < (this_addr + this_size));
+  }
+
   template<typename type> void StorePointer(type* addr, type value) const {
-    // TODO(iposva): Implement real store barrier here.
+    // Ensure that this object contains the addr.
+    ASSERT(Contains(reinterpret_cast<uword>(addr)));
     *addr = value;
     // Filter stores based on source and target.
     if (!value->IsHeapObject()) return;
     if (value->IsNewObject() && raw()->IsOldObject()) {
       uword ptr = reinterpret_cast<uword>(addr);
       Isolate::Current()->store_buffer()->AddPointer(ptr);
     }
   }
 
   RawObject* raw_;  // The raw object reference.
@@ skipping 3427 matching lines @@
     StorePointer(&raw_ptr()->data_, value.raw());
   }
 
   RawObject* At(intptr_t index) const {
     NoGCScope no_gc;
     ASSERT(!IsNull());
     ASSERT(index < Length());
     return *ObjectAddr(index);
   }
   void SetAt(intptr_t index, const Object& value) const {
-    NoGCScope no_gc;
     ASSERT(!IsNull());
     ASSERT(index < Length());
-    StorePointer(ObjectAddr(index), value.raw());
+    const Array& arr = Array::Handle(data());
+    arr.SetAt(index, value);
   }
 
   void Add(const Object& value, Heap::Space space = Heap::kNew) const;
   void Grow(intptr_t new_capacity, Heap::Space space = Heap::kNew) const;
   RawObject* RemoveLast() const;
 
   virtual RawAbstractTypeArguments* GetTypeArguments() const {
     ASSERT(AbstractTypeArguments::AreEqual(
         AbstractTypeArguments::Handle(Array::Handle(data()).GetTypeArguments()),
         AbstractTypeArguments::Handle(raw_ptr()->type_arguments_)));
@@ skipping 1358 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_