| Index: test/cctest/test-mark-compact.cc
|
| diff --git a/test/cctest/test-mark-compact.cc b/test/cctest/test-mark-compact.cc
|
| index 4b8ba812b5750547a8ed248f6a0aac8920b197f0..c9482d69eed049bcd851a63d0af66258ae6f022f 100644
|
| --- a/test/cctest/test-mark-compact.cc
|
| +++ b/test/cctest/test-mark-compact.cc
|
| @@ -323,16 +323,13 @@ TEST(ObjectGroups) {
|
| global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
|
| global_handles->MakeWeak(g1s1.location(),
|
| reinterpret_cast<void*>(1234),
|
| - &WeakPointerCallback,
|
| - NULL);
|
| + &WeakPointerCallback);
|
| global_handles->MakeWeak(g1s2.location(),
|
| reinterpret_cast<void*>(1234),
|
| - &WeakPointerCallback,
|
| - NULL);
|
| + &WeakPointerCallback);
|
| global_handles->MakeWeak(g1c1.location(),
|
| reinterpret_cast<void*>(1234),
|
| - &WeakPointerCallback,
|
| - NULL);
|
| + &WeakPointerCallback);
|
|
|
| Handle<Object> g2s1 =
|
| global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
|
| @@ -342,16 +339,13 @@ TEST(ObjectGroups) {
|
| global_handles->Create(HEAP->AllocateFixedArray(1)->ToObjectChecked());
|
| global_handles->MakeWeak(g2s1.location(),
|
| reinterpret_cast<void*>(1234),
|
| - &WeakPointerCallback,
|
| - NULL);
|
| + &WeakPointerCallback);
|
| global_handles->MakeWeak(g2s2.location(),
|
| reinterpret_cast<void*>(1234),
|
| - &WeakPointerCallback,
|
| - NULL);
|
| + &WeakPointerCallback);
|
| global_handles->MakeWeak(g2c1.location(),
|
| reinterpret_cast<void*>(1234),
|
| - &WeakPointerCallback,
|
| - NULL);
|
| + &WeakPointerCallback);
|
|
|
| Handle<Object> root = global_handles->Create(*g1s1); // make a root.
|
|
|
| @@ -380,8 +374,7 @@ TEST(ObjectGroups) {
|
| // Weaken the root.
|
| global_handles->MakeWeak(root.location(),
|
| reinterpret_cast<void*>(1234),
|
| - &WeakPointerCallback,
|
| - NULL);
|
| + &WeakPointerCallback);
|
| // But make children strong roots---all the objects (except for children)
|
| // should be collectable now.
|
| global_handles->ClearWeakness(g1c1.location());
|
| @@ -409,12 +402,10 @@ TEST(ObjectGroups) {
|
| // And now make children weak again and collect them.
|
| global_handles->MakeWeak(g1c1.location(),
|
| reinterpret_cast<void*>(1234),
|
| - &WeakPointerCallback,
|
| - NULL);
|
| + &WeakPointerCallback);
|
| global_handles->MakeWeak(g2c1.location(),
|
| reinterpret_cast<void*>(1234),
|
| - &WeakPointerCallback,
|
| - NULL);
|
| + &WeakPointerCallback);
|
|
|
| HEAP->CollectGarbage(OLD_POINTER_SPACE);
|
| CHECK_EQ(7, NumberOfWeakCalls);
|
|
|