New test case to ensure finalizers are not invoked on deleted handles.

runtime/vm/dart_api_impl_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 "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
 #include "platform/utils.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
@@ skipping 1400 matching lines @@
 
 
 static void WeakPersistentHandlePeerFinalizer(Dart_Handle handle, void* peer) {
   *static_cast<int*>(peer) = 42;
 }
 
 
 TEST_CASE(WeakPersistentHandleCallback) {
   Dart_Handle weak_ref = Dart_Null();
   EXPECT(Dart_IsNull(weak_ref));
-  int* peer = new int();
+  int peer = 0;
   {
     Dart_EnterScope();
     Dart_Handle obj = Dart_NewString("new string");
     EXPECT_VALID(obj);
-    weak_ref = Dart_NewWeakPersistentHandle(obj, peer,
+    weak_ref = Dart_NewWeakPersistentHandle(obj, &peer,
                                             WeakPersistentHandlePeerFinalizer);
     Dart_ExitScope();
   }
   EXPECT_VALID(weak_ref);
-  EXPECT(*peer == 0);
+  EXPECT(peer == 0);
   Isolate::Current()->heap()->CollectGarbage(Heap::kOld);
-  EXPECT(*peer == 0);
+  EXPECT(peer == 0);
   GCTestHelper::CollectNewSpace(Heap::kIgnoreApiCallbacks);
-  EXPECT(*peer == 42);
-  delete peer;
+  EXPECT(peer == 42);
   Dart_DeletePersistentHandle(weak_ref);
 }
 
 
+TEST_CASE(WeakPersistentHandleNoCallback) {
+  Dart_Handle weak_ref = Dart_Null();
+  EXPECT(Dart_IsNull(weak_ref));
+  int peer = 0;
+  {
+    Dart_EnterScope();
+    Dart_Handle obj = Dart_NewString("new string");
+    EXPECT_VALID(obj);
+    weak_ref = Dart_NewWeakPersistentHandle(obj, &peer,
+                                            WeakPersistentHandlePeerFinalizer);
+    Dart_ExitScope();
+  }
+  // A finalizer is not invoked on a deleted handle.  Therefore, the
+  // peer value should not change after the referent is collected.
+  Dart_DeletePersistentHandle(weak_ref);
+  EXPECT_VALID(weak_ref);
+  EXPECT(peer == 0);
+  Isolate::Current()->heap()->CollectGarbage(Heap::kOld);
+  EXPECT(peer == 0);
+  GCTestHelper::CollectNewSpace(Heap::kIgnoreApiCallbacks);
+  EXPECT(peer == 0);
+}
+
+
 TEST_CASE(ObjectGroups) {
   Dart_Handle strong = Dart_Null();
   EXPECT(Dart_IsNull(strong));
 
   Dart_Handle weak1 = Dart_Null();
   EXPECT(Dart_IsNull(weak1));
 
   Dart_Handle weak2 = Dart_Null();
   EXPECT(Dart_IsNull(weak2));
 
@@ skipping 5041 matching lines @@
   EXPECT(Dart_IsString(str));
   len = -1;
   EXPECT_VALID(Dart_StringLength(str, &len));
   EXPECT_EQ(0, len);
 }
 
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart