Add a weak property type to the virtual machine.

runtime/vm/object_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 "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
@@ skipping 2850 matching lines @@
       "#3      _bar (dart:test-lib:16:3)\n"
       "#4      MyClass.field (dart:test-lib:25:9)\n"
       "#5      MyClass.foo.fooHelper (dart:test-lib:30:7)\n"
       "#6      MyClass.foo (dart:test-lib:32:14)\n"
       "#7      MyClass.MyClass.<anonymous closure> (dart:test-lib:21:15)\n"
       "#8      MyClass.MyClass (dart:test-lib:21:18)\n"
       "#9      main.<anonymous closure> (dart:test-lib:37:10)\n"
       "#10     main (dart:test-lib:37:24)");
 }
 
+
+TEST_CASE(WeakProperty_PreserveOne_NewSpace) {

[turnidge, 2012/08/09 18:34:34]

Tests look good to me.

[cshapiro, 2012/08/14 04:58:18]

Thanks!

+  Isolate* isolate = Isolate::Current();
+  WeakProperty& weak = WeakProperty::Handle();
+  OneByteString& key = OneByteString::Handle();
+  key ^= OneByteString::New("key");
+  {
+    HANDLESCOPE(isolate);
+    OneByteString& value = OneByteString::Handle();
+    value ^= OneByteString::New("value");
+    weak ^= WeakProperty::New();
+    weak.set_key(key);
+    weak.set_value(value);
+  }
+  isolate->heap()->CollectAllGarbage();
+  EXPECT(weak.key() != Object::null());
+  EXPECT(weak.value() != Object::null());
+}
+
+
+TEST_CASE(WeakProperty_PreserveTwo_NewSpace) {
+  Isolate* isolate = Isolate::Current();
+  WeakProperty& weak1 = WeakProperty::Handle();
+  OneByteString& key1 = OneByteString::Handle();
+  key1 ^= OneByteString::New("key1");
+  WeakProperty& weak2 = WeakProperty::Handle();
+  OneByteString& key2 = OneByteString::Handle();
+  key2 ^= OneByteString::New("key2");
+  {
+    HANDLESCOPE(isolate);
+    OneByteString& value1 = OneByteString::Handle();
+    value1 ^= OneByteString::New("value1");
+    weak1 ^= WeakProperty::New();
+    weak1.set_key(key1);
+    weak1.set_value(value1);
+    OneByteString& value2 = OneByteString::Handle();
+    value2 ^= OneByteString::New("value2");
+    weak2 ^= WeakProperty::New();
+    weak2.set_key(key2);
+    weak2.set_value(value2);
+  }
+  isolate->heap()->CollectAllGarbage();
+  EXPECT(weak1.key() != Object::null());
+  EXPECT(weak1.value() != Object::null());
+  EXPECT(weak2.key() != Object::null());
+  EXPECT(weak2.value() != Object::null());
+}
+
+
+TEST_CASE(WeakProperty_PreserveTwoShared_NewSpace) {
+  Isolate* isolate = Isolate::Current();
+  WeakProperty& weak1 = WeakProperty::Handle();
+  WeakProperty& weak2 = WeakProperty::Handle();
+  OneByteString& key = OneByteString::Handle();
+  key ^= OneByteString::New("key");
+  {
+    HANDLESCOPE(isolate);
+    OneByteString& value1 = OneByteString::Handle();
+    value1 ^= OneByteString::New("value1");
+    weak1 ^= WeakProperty::New();
+    weak1.set_key(key);
+    weak1.set_value(value1);
+    OneByteString& value2 = OneByteString::Handle();
+    value2 ^= OneByteString::New("value2");
+    weak2 ^= WeakProperty::New();
+    weak2.set_key(key);
+    weak2.set_value(value2);
+  }
+  isolate->heap()->CollectAllGarbage();
+  EXPECT(weak1.key() != Object::null());
+  EXPECT(weak1.value() != Object::null());
+  EXPECT(weak2.key() != Object::null());
+  EXPECT(weak2.value() != Object::null());
+}
+
+
+TEST_CASE(WeakProperty_PreserveOne_OldSpace) {
+  Isolate* isolate = Isolate::Current();
+  WeakProperty& weak = WeakProperty::Handle();
+  OneByteString& key = OneByteString::Handle();
+  key ^= OneByteString::New("key", Heap::kOld);
+  {
+    HANDLESCOPE(isolate);
+    OneByteString& value = OneByteString::Handle();
+    value ^= OneByteString::New("value", Heap::kOld);
+    weak ^= WeakProperty::New(Heap::kOld);
+    weak.set_key(key);
+    weak.set_value(value);
+  }
+  isolate->heap()->CollectAllGarbage();
+  EXPECT(weak.key() != Object::null());
+  EXPECT(weak.value() != Object::null());
+}
+
+
+TEST_CASE(WeakProperty_PreserveTwo_OldSpace) {
+  Isolate* isolate = Isolate::Current();
+  WeakProperty& weak1 = WeakProperty::Handle();
+  OneByteString& key1 = OneByteString::Handle();
+  key1 ^= OneByteString::New("key1", Heap::kOld);
+  WeakProperty& weak2 = WeakProperty::Handle();
+  OneByteString& key2 = OneByteString::Handle();
+  key2 ^= OneByteString::New("key2", Heap::kOld);
+  {
+    HANDLESCOPE(isolate);
+    OneByteString& value1 = OneByteString::Handle();
+    value1 ^= OneByteString::New("value1", Heap::kOld);
+    weak1 ^= WeakProperty::New(Heap::kOld);
+    weak1.set_key(key1);
+    weak1.set_value(value1);
+    OneByteString& value2 = OneByteString::Handle();
+    value2 ^= OneByteString::New("value2", Heap::kOld);
+    weak2 ^= WeakProperty::New(Heap::kOld);
+    weak2.set_key(key2);
+    weak2.set_value(value2);
+  }
+  isolate->heap()->CollectAllGarbage();
+  EXPECT(weak1.key() != Object::null());
+  EXPECT(weak1.value() != Object::null());
+  EXPECT(weak2.key() != Object::null());
+  EXPECT(weak2.value() != Object::null());
+}
+
+
+TEST_CASE(WeakProperty_PreserveTwoShared_OldSpace) {
+  Isolate* isolate = Isolate::Current();
+  WeakProperty& weak1 = WeakProperty::Handle();
+  WeakProperty& weak2 = WeakProperty::Handle();
+  OneByteString& key = OneByteString::Handle();
+  key ^= OneByteString::New("key", Heap::kOld);
+  {
+    HANDLESCOPE(isolate);
+    OneByteString& value1 = OneByteString::Handle();
+    value1 ^= OneByteString::New("value1", Heap::kOld);
+    weak1 ^= WeakProperty::New(Heap::kOld);
+    weak1.set_key(key);
+    weak1.set_value(value1);
+    OneByteString& value2 = OneByteString::Handle();
+    value2 ^= OneByteString::New("value2", Heap::kOld);
+    weak2 ^= WeakProperty::New(Heap::kOld);
+    weak2.set_key(key);
+    weak2.set_value(value2);
+  }
+  isolate->heap()->CollectAllGarbage();
+  EXPECT(weak1.key() != Object::null());
+  EXPECT(weak1.value() != Object::null());
+  EXPECT(weak2.key() != Object::null());
+  EXPECT(weak2.value() != Object::null());
+}
+
+
+TEST_CASE(WeakProperty_ClearOne_NewSpace) {
+  Isolate* isolate = Isolate::Current();
+  WeakProperty& weak = WeakProperty::Handle();
+  {
+    HANDLESCOPE(isolate);
+    OneByteString& key = OneByteString::Handle();
+    key ^= OneByteString::New("key");
+    OneByteString& value = OneByteString::Handle();
+    value ^= OneByteString::New("value");
+    weak ^= WeakProperty::New();
+    weak.set_key(key);
+    weak.set_value(value);
+    key ^= OneByteString::null();
+    value ^= OneByteString::null();
+  }
+  isolate->heap()->CollectAllGarbage();
+  EXPECT(weak.key() == Object::null());
+  EXPECT(weak.value() == Object::null());
+}
+
+
+TEST_CASE(WeakProperty_ClearTwoShared_NewSpace) {
+  Isolate* isolate = Isolate::Current();
+  WeakProperty& weak1 = WeakProperty::Handle();
+  WeakProperty& weak2 = WeakProperty::Handle();
+  {
+    HANDLESCOPE(isolate);
+    OneByteString& key = OneByteString::Handle();
+    key ^= OneByteString::New("key");
+    OneByteString& value1 = OneByteString::Handle();
+    value1 ^= OneByteString::New("value1");
+    weak1 ^= WeakProperty::New();
+    weak1.set_key(key);
+    weak1.set_value(value1);
+    OneByteString& value2 = OneByteString::Handle();
+    value2 ^= OneByteString::New("value2");
+    weak2 ^= WeakProperty::New();
+    weak2.set_key(key);
+    weak2.set_value(value2);
+  }
+  isolate->heap()->CollectAllGarbage();
+  EXPECT(weak1.key() == Object::null());
+  EXPECT(weak1.value() == Object::null());
+  EXPECT(weak2.key() == Object::null());
+  EXPECT(weak2.value() == Object::null());
+}
+
+
+TEST_CASE(WeakProperty_ClearOne_OldSpace) {
+  Isolate* isolate = Isolate::Current();
+  WeakProperty& weak = WeakProperty::Handle();
+  {
+    HANDLESCOPE(isolate);
+    OneByteString& key = OneByteString::Handle();
+    key ^= OneByteString::New("key", Heap::kOld);
+    OneByteString& value = OneByteString::Handle();
+    value ^= OneByteString::New("value", Heap::kOld);
+    weak ^= WeakProperty::New(Heap::kOld);
+    weak.set_key(key);
+    weak.set_value(value);
+    key ^= OneByteString::null();
+    value ^= OneByteString::null();
+  }
+  isolate->heap()->CollectAllGarbage();
+  EXPECT(weak.key() == Object::null());
+  EXPECT(weak.value() == Object::null());
+}
+
+
+TEST_CASE(WeakProperty_ClearTwoShared_OldSpace) {
+  Isolate* isolate = Isolate::Current();
+  WeakProperty& weak1 = WeakProperty::Handle();
+  WeakProperty& weak2 = WeakProperty::Handle();
+  {
+    HANDLESCOPE(isolate);
+    OneByteString& key = OneByteString::Handle();
+    key ^= OneByteString::New("key", Heap::kOld);
+    OneByteString& value1 = OneByteString::Handle();
+    value1 ^= OneByteString::New("value1");
+    weak1 ^= WeakProperty::New(Heap::kOld);
+    weak1.set_key(key);
+    weak1.set_value(value1);
+    OneByteString& value2 = OneByteString::Handle();
+    value2 ^= OneByteString::New("value2", Heap::kOld);
+    weak2 ^= WeakProperty::New(Heap::kOld);
+    weak2.set_key(key);
+    weak2.set_value(value2);
+  }
+  isolate->heap()->CollectAllGarbage();
+  EXPECT(weak1.key() == Object::null());
+  EXPECT(weak1.value() == Object::null());
+  EXPECT(weak2.key() == Object::null());
+  EXPECT(weak2.value() == Object::null());
+}
+
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart