- Remember the fact that an object has been added to the

runtime/vm/assembler_test.cc

Index: runtime/vm/assembler_test.cc
===================================================================
--- runtime/vm/assembler_test.cc	(revision 22392)
+++ runtime/vm/assembler_test.cc	(working copy)
@@ -39,44 +39,37 @@
   const Context& ctx = Context::Handle(Context::New(0));
 
   EXPECT(old_array.raw() == grow_old_array.data());
-  EXPECT(!Isolate::Current()->store_buffer_block()->Contains(
-      reinterpret_cast<uword>(grow_old_array.raw())));
+  EXPECT(!Isolate::Current()->store_buffer()->Contains(grow_old_array.raw()));
   EXPECT(old_array.raw() == grow_new_array.data());
-  EXPECT(!Isolate::Current()->store_buffer_block()->Contains(
-      reinterpret_cast<uword>(grow_new_array.raw())));
+  EXPECT(!Isolate::Current()->store_buffer()->Contains(grow_new_array.raw()));
 
   // Store Smis into the old object.
   for (int i = -128; i < 128; i++) {
     smi = Smi::New(i);
     test_code(ctx.raw(), smi.raw(), grow_old_array.raw());
     EXPECT(reinterpret_cast<RawArray*>(smi.raw()) == grow_old_array.data());
-    EXPECT(!Isolate::Current()->store_buffer_block()->Contains(
-       reinterpret_cast<uword>(grow_old_array.raw())));
+    EXPECT(!Isolate::Current()->store_buffer()->Contains(grow_old_array.raw()));
   }
 
   // Store an old object into the old object.
   test_code(ctx.raw(), old_array.raw(), grow_old_array.raw());
   EXPECT(old_array.raw() == grow_old_array.data());
-  EXPECT(!Isolate::Current()->store_buffer_block()->Contains(
-      reinterpret_cast<uword>(grow_old_array.raw())));
+  EXPECT(!Isolate::Current()->store_buffer()->Contains(grow_old_array.raw()));
 
   // Store a new object into the old object.
   test_code(ctx.raw(), new_array.raw(), grow_old_array.raw());
   EXPECT(new_array.raw() == grow_old_array.data());
-  EXPECT(Isolate::Current()->store_buffer_block()->Contains(
-      reinterpret_cast<uword>(grow_old_array.raw())));
+  EXPECT(Isolate::Current()->store_buffer()->Contains(grow_old_array.raw()));
 
   // Store a new object into the new object.
   test_code(ctx.raw(), new_array.raw(), grow_new_array.raw());
   EXPECT(new_array.raw() == grow_new_array.data());
-  EXPECT(!Isolate::Current()->store_buffer_block()->Contains(
-      reinterpret_cast<uword>(grow_new_array.raw())));
+  EXPECT(!Isolate::Current()->store_buffer()->Contains(grow_new_array.raw()));
 
   // Store an old object into the new object.
   test_code(ctx.raw(), old_array.raw(), grow_new_array.raw());
   EXPECT(old_array.raw() == grow_new_array.data());
-  EXPECT(!Isolate::Current()->store_buffer_block()->Contains(
-      reinterpret_cast<uword>(grow_new_array.raw())));
+  EXPECT(!Isolate::Current()->store_buffer()->Contains(grow_new_array.raw()));
 }
 
 }  // namespace dart