- Fix the x64 store-barrier.

runtime/vm/assembler_test.cc

+// 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.
+
+#include "vm/assembler.h"
+#include "vm/globals.h"
+#include "vm/os.h"
+#include "vm/unit_test.h"
+#include "vm/virtual_memory.h"
+
+namespace dart {
+
+ASSEMBLER_TEST_EXTERN(StoreIntoObject);
+
+ASSEMBLER_TEST_RUN(StoreIntoObject, entry) {

[cshapiro, 2012/06/22 23:22:40]

This test only needs to test StoreIntoObjectFilter, not all of StoreIntoObject. 
I think this test code may have predated my factoring of the store code in two. 
Nevertheless, it would be helpful to validate only the behavior of the filter to
avoid breaking when StoreIntoObject acquires additional behavior.

[cshapiro, 2012/06/22 23:46:42]

FYI: an example of this will be with tracing which may log to the store buffer
even if the filter would have otherwise filtered the store.

+  typedef void (*StoreData)(RawContext* ctx,
+                            RawObject* value,
+                            RawObject* growable_array);
+  StoreData test_code = reinterpret_cast<StoreData>(entry);
+
+  const Array& old_array = Array::Handle(Array::New(3, Heap::kOld));
+  const Array& new_array = Array::Handle(Array::New(3, Heap::kNew));
+  const GrowableObjectArray& grow_old_array = GrowableObjectArray::Handle(
+      GrowableObjectArray::New(old_array, Heap::kOld));
+  const GrowableObjectArray& grow_new_array = GrowableObjectArray::Handle(
+      GrowableObjectArray::New(old_array, Heap::kNew));
+  Smi& smi = Smi::Handle();
+  const Context& ctx = Context::Handle(Context::New(0));
+
+  EXPECT(old_array.raw() == grow_old_array.data());
+  EXPECT(!Isolate::Current()->store_buffer()->Contains(
+      reinterpret_cast<uword>(grow_old_array.raw()) +
+      GrowableObjectArray::data_offset() - kHeapObjectTag));
+  EXPECT(old_array.raw() == grow_new_array.data());
+  EXPECT(!Isolate::Current()->store_buffer()->Contains(
+      reinterpret_cast<uword>(grow_new_array.raw()) +
+      GrowableObjectArray::data_offset() - kHeapObjectTag));
+
+  // Store Smis into the old object.
+  for (int i = -32; i < 32; i++) {

[cshapiro, 2012/06/22 23:22:40]

Testing the full range of 8-bit immediate values reachable by the test would
help to catch errors in the event that the filter changes.

[Ivan Posva, 2012/06/22 23:42:21]

 Changed to test from -128 to 128.

+    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()->Contains(
+       reinterpret_cast<uword>(grow_old_array.raw()) +
+       GrowableObjectArray::data_offset() - kHeapObjectTag));
+  }
+
+  // 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()->Contains(
+      reinterpret_cast<uword>(grow_old_array.raw()) +
+      GrowableObjectArray::data_offset() - kHeapObjectTag));
+
+  // 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()->Contains(
+      reinterpret_cast<uword>(grow_old_array.raw()) +
+      GrowableObjectArray::data_offset() - kHeapObjectTag));
+
+  // 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()->Contains(
+      reinterpret_cast<uword>(grow_new_array.raw()) +
+      GrowableObjectArray::data_offset() - kHeapObjectTag));
+
+  // 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()->Contains(
+      reinterpret_cast<uword>(grow_new_array.raw()) +
+      GrowableObjectArray::data_offset() - kHeapObjectTag));
+}
+
+}  // namespace dart