Remove internal uses of deprecated MakeWeak.

test/cctest/test-api.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 11 matching lines @@
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <climits>
 #include <csignal>
 #include <string>
 #include <map>
+#include <utility>

[Michael Starzinger, 2013/12/02 15:34:10]

nit: Can we alpha-sort the system includes block?

[Sven Panne, 2013/12/02 17:30:53]

Done.

 
 #include "v8.h"
 
 #if V8_OS_POSIX
 #include <unistd.h>  // NOLINT
 #endif
 
 #include "api.h"
 #include "arguments.h"
 #include "cctest.h"
 #include "compilation-cache.h"
 #include "cpu-profiler.h"
 #include "execution.h"
 #include "isolate.h"
 #include "objects.h"
 #include "parser.h"
 #include "platform.h"
 #include "snapshot.h"
 #include "unicode-inl.h"
 #include "utils.h"
 #include "vm-state.h"
 
 static const bool kLogThreading = false;
 
+using std::pair;
+
 using ::v8::Boolean;
 using ::v8::BooleanObject;
 using ::v8::Context;
 using ::v8::Extension;
 using ::v8::Function;
 using ::v8::FunctionTemplate;
 using ::v8::Handle;
 using ::v8::HandleScope;
 using ::v8::Local;
 using ::v8::Message;
@@ skipping 3372 matching lines @@
   int id() { return id_; }
   void increment() { number_of_weak_calls_++; }
   int NumberOfWeakCalls() { return number_of_weak_calls_; }
  private:
   int id_;
   int number_of_weak_calls_;
 };
 
 
 template<typename T>
-static void WeakPointerCallback(v8::Isolate* isolate,
-                                Persistent<T>* handle,
-                                WeakCallCounter* counter) {
-  CHECK_EQ(1234, counter->id());
-  counter->increment();
-  handle->Reset();
+static void WeakPointerCallback(
+    const v8::WeakCallbackData<T, std::pair<v8::Persistent<T>*,
+                                            WeakCallCounter*> >& data) {
+  CHECK_EQ(1234, data.GetParameter()->second->id());
+  data.GetParameter()->second->increment();
+  data.GetParameter()->first->Reset();
 }
 
 
 template<typename T>
 static UniqueId MakeUniqueId(const Persistent<T>& p) {
   return UniqueId(reinterpret_cast<uintptr_t>(*v8::Utils::OpenPersistent(p)));
 }
 
 
 THREADED_TEST(ApiObjectGroups) {
   LocalContext env;
   v8::Isolate* iso = env->GetIsolate();
   HandleScope scope(iso);
 
   Persistent<Value> g1s1;
   Persistent<Value> g1s2;
   Persistent<Value> g1c1;
   Persistent<Value> g2s1;
   Persistent<Value> g2s2;
   Persistent<Value> g2c1;
 
   WeakCallCounter counter(1234);
 
+  pair<Persistent<Value>*, WeakCallCounter*> g1s1p(&g1s1, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g1s2p(&g1s2, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g1c1p(&g1c1, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g2s1p(&g2s1, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g2s2p(&g2s2, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g2c1p(&g2c1, &counter);
+
   {
     HandleScope scope(iso);
     g1s1.Reset(iso, Object::New());
     g1s2.Reset(iso, Object::New());
     g1c1.Reset(iso, Object::New());
-    g1s1.MakeWeak(&counter, &WeakPointerCallback);
-    g1s2.MakeWeak(&counter, &WeakPointerCallback);
-    g1c1.MakeWeak(&counter, &WeakPointerCallback);
+    g1s1.SetWeak(&g1s1p, &WeakPointerCallback);
+    g1s2.SetWeak(&g1s2p, &WeakPointerCallback);
+    g1c1.SetWeak(&g1c1p, &WeakPointerCallback);
 
     g2s1.Reset(iso, Object::New());
     g2s2.Reset(iso, Object::New());
     g2c1.Reset(iso, Object::New());
-    g2s1.MakeWeak(&counter, &WeakPointerCallback);
-    g2s2.MakeWeak(&counter, &WeakPointerCallback);
-    g2c1.MakeWeak(&counter, &WeakPointerCallback);
+    g2s1.SetWeak(&g2s1p, &WeakPointerCallback);
+    g2s2.SetWeak(&g2s2p, &WeakPointerCallback);
+    g2c1.SetWeak(&g2c1p, &WeakPointerCallback);
   }
 
   Persistent<Value> root(iso, g1s1);  // make a root.
+  pair<Persistent<Value>*, WeakCallCounter*> rootp(&root, &counter);
 
   // Connect group 1 and 2, make a cycle.
   {
     HandleScope scope(iso);
     CHECK(Local<Object>::New(iso, g1s2.As<Object>())->
             Set(0, Local<Value>::New(iso, g2s2)));
     CHECK(Local<Object>::New(iso, g2s1.As<Object>())->
             Set(0, Local<Value>::New(iso, g1s1)));
   }
 
   {
     UniqueId id1 = MakeUniqueId(g1s1);
     UniqueId id2 = MakeUniqueId(g2s2);
     iso->SetObjectGroupId(g1s1, id1);
     iso->SetObjectGroupId(g1s2, id1);
     iso->SetReferenceFromGroup(id1, g1c1);
     iso->SetObjectGroupId(g2s1, id2);
     iso->SetObjectGroupId(g2s2, id2);
     iso->SetReferenceFromGroup(id2, g2c1);
   }
   // Do a single full GC, ensure incremental marking is stopped.
   v8::internal::Heap* heap = reinterpret_cast<v8::internal::Isolate*>(
       iso)->heap();
   heap->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask);
 
   // All object should be alive.
   CHECK_EQ(0, counter.NumberOfWeakCalls());
 
   // Weaken the root.
-  root.MakeWeak(&counter, &WeakPointerCallback);
+  root.SetWeak(&rootp, &WeakPointerCallback);
   // But make children strong roots---all the objects (except for children)
   // should be collectable now.
   g1c1.ClearWeak();
   g2c1.ClearWeak();
 
   // Groups are deleted, rebuild groups.
   {
     UniqueId id1 = MakeUniqueId(g1s1);
     UniqueId id2 = MakeUniqueId(g2s2);
     iso->SetObjectGroupId(g1s1, id1);
     iso->SetObjectGroupId(g1s2, id1);
     iso->SetReferenceFromGroup(id1, g1c1);
     iso->SetObjectGroupId(g2s1, id2);
     iso->SetObjectGroupId(g2s2, id2);
     iso->SetReferenceFromGroup(id2, g2c1);
   }
 
   heap->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask);
 
   // All objects should be gone. 5 global handles in total.
   CHECK_EQ(5, counter.NumberOfWeakCalls());
 
   // And now make children weak again and collect them.
-  g1c1.MakeWeak(&counter, &WeakPointerCallback);
-  g2c1.MakeWeak(&counter, &WeakPointerCallback);
+  g1c1.SetWeak(&g1c1p, &WeakPointerCallback);
+  g2c1.SetWeak(&g2c1p, &WeakPointerCallback);
 
   heap->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask);
   CHECK_EQ(7, counter.NumberOfWeakCalls());
 }
 
 
 THREADED_TEST(ApiObjectGroupsForSubtypes) {
   LocalContext env;
   v8::Isolate* iso = env->GetIsolate();
   HandleScope scope(iso);
 
   Persistent<Object> g1s1;
   Persistent<String> g1s2;
   Persistent<String> g1c1;
   Persistent<Object> g2s1;
   Persistent<String> g2s2;
   Persistent<String> g2c1;
 
   WeakCallCounter counter(1234);
 
+  pair<Persistent<Object>*, WeakCallCounter*> g1s1p(&g1s1, &counter);
+  pair<Persistent<String>*, WeakCallCounter*> g1s2p(&g1s2, &counter);
+  pair<Persistent<String>*, WeakCallCounter*> g1c1p(&g1c1, &counter);
+  pair<Persistent<Object>*, WeakCallCounter*> g2s1p(&g2s1, &counter);
+  pair<Persistent<String>*, WeakCallCounter*> g2s2p(&g2s2, &counter);
+  pair<Persistent<String>*, WeakCallCounter*> g2c1p(&g2c1, &counter);
+
   {
     HandleScope scope(iso);
     g1s1.Reset(iso, Object::New());
     g1s2.Reset(iso, String::NewFromUtf8(iso, "foo1"));
     g1c1.Reset(iso, String::NewFromUtf8(iso, "foo2"));
-    g1s1.MakeWeak(&counter, &WeakPointerCallback);
-    g1s2.MakeWeak(&counter, &WeakPointerCallback);
-    g1c1.MakeWeak(&counter, &WeakPointerCallback);
+    g1s1.SetWeak(&g1s1p, &WeakPointerCallback);
+    g1s2.SetWeak(&g1s2p, &WeakPointerCallback);
+    g1c1.SetWeak(&g1c1p, &WeakPointerCallback);
 
     g2s1.Reset(iso, Object::New());
     g2s2.Reset(iso, String::NewFromUtf8(iso, "foo3"));
     g2c1.Reset(iso, String::NewFromUtf8(iso, "foo4"));
-    g2s1.MakeWeak(&counter, &WeakPointerCallback);
-    g2s2.MakeWeak(&counter, &WeakPointerCallback);
-    g2c1.MakeWeak(&counter, &WeakPointerCallback);
+    g2s1.SetWeak(&g2s1p, &WeakPointerCallback);
+    g2s2.SetWeak(&g2s2p, &WeakPointerCallback);
+    g2c1.SetWeak(&g2c1p, &WeakPointerCallback);
   }
 
   Persistent<Value> root(iso, g1s1);  // make a root.
+  pair<Persistent<Value>*, WeakCallCounter*> rootp(&root, &counter);
 
   // Connect group 1 and 2, make a cycle.
   {
     HandleScope scope(iso);
     CHECK(Local<Object>::New(iso, g1s1)->Set(0, Local<Object>::New(iso, g2s1)));
     CHECK(Local<Object>::New(iso, g2s1)->Set(0, Local<Object>::New(iso, g1s1)));
   }
 
   {
     UniqueId id1 = MakeUniqueId(g1s1);
     UniqueId id2 = MakeUniqueId(g2s2);
     iso->SetObjectGroupId(g1s1, id1);
     iso->SetObjectGroupId(g1s2, id1);
     iso->SetReference(g1s1, g1c1);
     iso->SetObjectGroupId(g2s1, id2);
     iso->SetObjectGroupId(g2s2, id2);
     iso->SetReferenceFromGroup(id2, g2c1);
   }
   // Do a single full GC, ensure incremental marking is stopped.
   v8::internal::Heap* heap = reinterpret_cast<v8::internal::Isolate*>(
       iso)->heap();
   heap->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask);
 
   // All object should be alive.
   CHECK_EQ(0, counter.NumberOfWeakCalls());
 
   // Weaken the root.
-  root.MakeWeak(&counter, &WeakPointerCallback);
+  root.SetWeak(&rootp, &WeakPointerCallback);
   // But make children strong roots---all the objects (except for children)
   // should be collectable now.
   g1c1.ClearWeak();
   g2c1.ClearWeak();
 
   // Groups are deleted, rebuild groups.
   {
     UniqueId id1 = MakeUniqueId(g1s1);
     UniqueId id2 = MakeUniqueId(g2s2);
     iso->SetObjectGroupId(g1s1, id1);
     iso->SetObjectGroupId(g1s2, id1);
     iso->SetReference(g1s1, g1c1);
     iso->SetObjectGroupId(g2s1, id2);
     iso->SetObjectGroupId(g2s2, id2);
     iso->SetReferenceFromGroup(id2, g2c1);
   }
 
   heap->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask);
 
   // All objects should be gone. 5 global handles in total.
   CHECK_EQ(5, counter.NumberOfWeakCalls());
 
   // And now make children weak again and collect them.
-  g1c1.MakeWeak(&counter, &WeakPointerCallback);
-  g2c1.MakeWeak(&counter, &WeakPointerCallback);
+  g1c1.SetWeak(&g1c1p, &WeakPointerCallback);
+  g2c1.SetWeak(&g2c1p, &WeakPointerCallback);
 
   heap->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask);
   CHECK_EQ(7, counter.NumberOfWeakCalls());
 }
 
 
 THREADED_TEST(ApiObjectGroupsCycle) {
   LocalContext env;
   v8::Isolate* iso = env->GetIsolate();
   HandleScope scope(iso);
 
   WeakCallCounter counter(1234);
 
   Persistent<Value> g1s1;
   Persistent<Value> g1s2;
   Persistent<Value> g2s1;
   Persistent<Value> g2s2;
   Persistent<Value> g3s1;
   Persistent<Value> g3s2;
   Persistent<Value> g4s1;
   Persistent<Value> g4s2;
 
+  pair<Persistent<Value>*, WeakCallCounter*> g1s1p(&g1s1, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g1s2p(&g1s2, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g2s1p(&g2s1, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g2s2p(&g2s2, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g3s1p(&g3s1, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g3s2p(&g3s2, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g4s1p(&g4s1, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g4s2p(&g4s2, &counter);
+
   {
     HandleScope scope(iso);
     g1s1.Reset(iso, Object::New());
     g1s2.Reset(iso, Object::New());
-    g1s1.MakeWeak(&counter, &WeakPointerCallback);
-    g1s2.MakeWeak(&counter, &WeakPointerCallback);
+    g1s1.SetWeak(&g1s1p, &WeakPointerCallback);
+    g1s2.SetWeak(&g1s2p, &WeakPointerCallback);
     CHECK(g1s1.IsWeak());
     CHECK(g1s2.IsWeak());
 
     g2s1.Reset(iso, Object::New());
     g2s2.Reset(iso, Object::New());
-    g2s1.MakeWeak(&counter, &WeakPointerCallback);
-    g2s2.MakeWeak(&counter, &WeakPointerCallback);
+    g2s1.SetWeak(&g2s1p, &WeakPointerCallback);
+    g2s2.SetWeak(&g2s2p, &WeakPointerCallback);
     CHECK(g2s1.IsWeak());
     CHECK(g2s2.IsWeak());
 
     g3s1.Reset(iso, Object::New());
     g3s2.Reset(iso, Object::New());
-    g3s1.MakeWeak(&counter, &WeakPointerCallback);
-    g3s2.MakeWeak(&counter, &WeakPointerCallback);
+    g3s1.SetWeak(&g3s1p, &WeakPointerCallback);
+    g3s2.SetWeak(&g3s2p, &WeakPointerCallback);
     CHECK(g3s1.IsWeak());
     CHECK(g3s2.IsWeak());
 
     g4s1.Reset(iso, Object::New());
     g4s2.Reset(iso, Object::New());
-    g4s1.MakeWeak(&counter, &WeakPointerCallback);
-    g4s2.MakeWeak(&counter, &WeakPointerCallback);
+    g4s1.SetWeak(&g4s1p, &WeakPointerCallback);
+    g4s2.SetWeak(&g4s2p, &WeakPointerCallback);
     CHECK(g4s1.IsWeak());
     CHECK(g4s2.IsWeak());
   }
 
   Persistent<Value> root(iso, g1s1);  // make a root.
+  pair<Persistent<Value>*, WeakCallCounter*> rootp(&root, &counter);
 
   // Connect groups.  We're building the following cycle:
   // G1: { g1s1, g2s1 }, g1s1 implicitly references g2s1, ditto for other
   // groups.
   {
     UniqueId id1 = MakeUniqueId(g1s1);
     UniqueId id2 = MakeUniqueId(g2s1);
     UniqueId id3 = MakeUniqueId(g3s1);
     UniqueId id4 = MakeUniqueId(g4s1);
     iso->SetObjectGroupId(g1s1, id1);
@@ skipping 11 matching lines @@
   }
   // Do a single full GC
   v8::internal::Heap* heap = reinterpret_cast<v8::internal::Isolate*>(
       iso)->heap();
   heap->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask);
 
   // All object should be alive.
   CHECK_EQ(0, counter.NumberOfWeakCalls());
 
   // Weaken the root.
-  root.MakeWeak(&counter, &WeakPointerCallback);
+  root.SetWeak(&rootp, &WeakPointerCallback);
 
   // Groups are deleted, rebuild groups.
   {
     UniqueId id1 = MakeUniqueId(g1s1);
     UniqueId id2 = MakeUniqueId(g2s1);
     UniqueId id3 = MakeUniqueId(g3s1);
     UniqueId id4 = MakeUniqueId(g4s1);
     iso->SetObjectGroupId(g1s1, id1);
     iso->SetObjectGroupId(g1s2, id1);
     iso->SetReferenceFromGroup(id1, g2s1);
@@ skipping 26 matching lines @@
 
   WeakCallCounter counter(1234);
 
   Persistent<Value> g1s1;
   Persistent<Value> g1s2;
   Persistent<Value> g2s1;
   Persistent<Value> g2s2;
   Persistent<Value> g3s1;
   Persistent<Value> g3s2;
 
+  pair<Persistent<Value>*, WeakCallCounter*> g1s1p(&g1s1, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g1s2p(&g1s2, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g2s1p(&g2s1, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g2s2p(&g2s2, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g3s1p(&g3s1, &counter);
+  pair<Persistent<Value>*, WeakCallCounter*> g3s2p(&g3s2, &counter);
+
   {
     HandleScope scope(iso);
     g1s1.Reset(iso, Object::New());
     g1s2.Reset(iso, Object::New());
-    g1s1.MakeWeak(&counter, &WeakPointerCallback);
-    g1s2.MakeWeak(&counter, &WeakPointerCallback);
+    g1s1.SetWeak(&g1s1p, &WeakPointerCallback);
+    g1s2.SetWeak(&g1s2p, &WeakPointerCallback);
 
     g2s1.Reset(iso, Object::New());
     g2s2.Reset(iso, Object::New());
-    g2s1.MakeWeak(&counter, &WeakPointerCallback);
-    g2s2.MakeWeak(&counter, &WeakPointerCallback);
+    g2s1.SetWeak(&g2s1p, &WeakPointerCallback);
+    g2s2.SetWeak(&g2s2p, &WeakPointerCallback);
 
     g3s1.Reset(iso, Object::New());
     g3s2.Reset(iso, Object::New());
-    g3s1.MakeWeak(&counter, &WeakPointerCallback);
-    g3s2.MakeWeak(&counter, &WeakPointerCallback);
+    g3s1.SetWeak(&g3s1p, &WeakPointerCallback);
+    g3s2.SetWeak(&g3s2p, &WeakPointerCallback);
   }
 
   // Make a root.
   Persistent<Value> root(iso, g1s1);
+  pair<Persistent<Value>*, WeakCallCounter*> rootp(&root, &counter);
   root.MarkPartiallyDependent();
 
   // Connect groups.  We're building the following cycle:
   // G1: { g1s1, g2s1 }, g1s1 implicitly references g2s1, ditto for other
   // groups.
   {
     HandleScope handle_scope(iso);
     g1s1.MarkPartiallyDependent();
     g1s2.MarkPartiallyDependent();
     g2s1.MarkPartiallyDependent();
@@ skipping 15 matching lines @@
   }
 
   v8::internal::Heap* heap = reinterpret_cast<v8::internal::Isolate*>(
       iso)->heap();
   heap->CollectGarbage(i::NEW_SPACE);
 
   // All objects should be alive.
   CHECK_EQ(0, counter.NumberOfWeakCalls());
 
   // Weaken the root.
-  root.MakeWeak(&counter, &WeakPointerCallback);
+  root.SetWeak(&rootp, &WeakPointerCallback);
   root.MarkPartiallyDependent();
 
   // Groups are deleted, rebuild groups.
   {
     HandleScope handle_scope(iso);
     g1s1.MarkPartiallyDependent();
     g1s2.MarkPartiallyDependent();
     g2s1.MarkPartiallyDependent();
     g2s2.MarkPartiallyDependent();
     g3s1.MarkPartiallyDependent();
@@ skipping 3103 matching lines @@
   v8::V8::AddMessageListener(MissingScriptInfoMessageListener);
   Script::Compile(v8_str("throw Error()"))->Run();
   v8::V8::RemoveMessageListeners(MissingScriptInfoMessageListener);
 }
 
 
 int global_index = 0;
 
 class Snorkel {
  public:
-  Snorkel() { index_ = global_index++; }
+  explicit Snorkel(v8::Persistent<v8::Object>* prev)
+      : prev_(prev), index_(global_index++) { }
+  v8::Persistent<v8::Object>* prev_;
   int index_;
 };
 
 class Whammy {
  public:
   explicit Whammy(v8::Isolate* isolate) : cursor_(0), isolate_(isolate) { }
   ~Whammy() { script_.Reset(); }
   v8::Handle<Script> getScript() {
     if (script_.IsEmpty()) script_.Reset(isolate_, v8_compile("({}).blammo"));
     return Local<Script>::New(isolate_, script_);
   }
 
  public:
   static const int kObjectCount = 256;
   int cursor_;
   v8::Isolate* isolate_;
   v8::Persistent<v8::Object> objects_[kObjectCount];
   v8::Persistent<Script> script_;
 };
 
-static void HandleWeakReference(v8::Isolate* isolate,
-                                v8::Persistent<v8::Value>* obj,
-                                Snorkel* snorkel) {
-  delete snorkel;
-  obj->ClearWeak();
+static void HandleWeakReference(
+    const v8::WeakCallbackData<v8::Object, Snorkel>& data) {
+  data.GetParameter()->prev_->ClearWeak();
+  delete data.GetParameter();
 }
 
 void WhammyPropertyGetter(Local<String> name,
                           const v8::PropertyCallbackInfo<v8::Value>& info) {
   Whammy* whammy =
     static_cast<Whammy*>(v8::Handle<v8::External>::Cast(info.Data())->Value());
 
   v8::Persistent<v8::Object>& prev = whammy->objects_[whammy->cursor_];
 
   v8::Handle<v8::Object> obj = v8::Object::New();
   if (!prev.IsEmpty()) {
     v8::Local<v8::Object>::New(info.GetIsolate(), prev)
         ->Set(v8_str("next"), obj);
-    prev.MakeWeak<Value, Snorkel>(new Snorkel(), &HandleWeakReference);
+    prev.SetWeak(new Snorkel(&prev), &HandleWeakReference);
   }
   whammy->objects_[whammy->cursor_].Reset(info.GetIsolate(), obj);
   whammy->cursor_ = (whammy->cursor_ + 1) % Whammy::kObjectCount;
   info.GetReturnValue().Set(whammy->getScript()->Run());
 }
 
 
 THREADED_TEST(WeakReference) {
   v8::HandleScope handle_scope(CcTest::isolate());
   v8::Handle<v8::ObjectTemplate> templ= v8::ObjectTemplate::New();
@@ skipping 17 matching lines @@
       "  last = obj;"
       "}"
       "gc();"
       "4";
   v8::Handle<Value> result = CompileRun(code);
   CHECK_EQ(4.0, result->NumberValue());
   delete whammy;
 }
 
 
-static void DisposeAndSetFlag(v8::Isolate* isolate,
-                              v8::Persistent<v8::Object>* obj,
-                              bool* data) {
-  obj->Reset();
-  *(data) = true;
+static void DisposeAndSetFlag(
+    const v8::WeakCallbackData<v8::Object,
+                               pair<v8::Persistent<v8::Object>*,
+                                    bool> >& data) {
+  data.GetParameter()->first->Reset();
+  data.GetParameter()->second = true;
 }
 
 
 THREADED_TEST(IndependentWeakHandle) {
   v8::Isolate* iso = CcTest::isolate();
   v8::HandleScope scope(iso);
   v8::Handle<Context> context = Context::New(iso);
   Context::Scope context_scope(context);
 
   v8::Persistent<v8::Object> object_a, object_b;
 
   {
     v8::HandleScope handle_scope(iso);
     object_a.Reset(iso, v8::Object::New());
     object_b.Reset(iso, v8::Object::New());
   }
 
-  bool object_a_disposed = false;
-  bool object_b_disposed = false;
-  object_a.MakeWeak(&object_a_disposed, &DisposeAndSetFlag);
-  object_b.MakeWeak(&object_b_disposed, &DisposeAndSetFlag);
+  pair<v8::Persistent<v8::Object>*, bool> object_a_pair(&object_a, false);
+  pair<v8::Persistent<v8::Object>*, bool> object_b_pair(&object_b, false);
+  object_a.SetWeak(&object_a_pair, &DisposeAndSetFlag);
+  object_b.SetWeak(&object_b_pair, &DisposeAndSetFlag);
   CHECK(!object_b.IsIndependent());
   object_a.MarkIndependent();
   object_b.MarkIndependent();
   CHECK(object_b.IsIndependent());
   CcTest::heap()->PerformScavenge();
-  CHECK(object_a_disposed);
-  CHECK(object_b_disposed);
+  CHECK(object_a_pair.second);
+  CHECK(object_b_pair.second);
 }
 
 
 static void InvokeScavenge() {
   CcTest::heap()->PerformScavenge();
 }
 
 
 static void InvokeMarkSweep() {
   CcTest::heap()->CollectAllGarbage(i::Heap::kNoGCFlags);
 }
 
 
-static void ForceScavenge(v8::Isolate* isolate,
-                          v8::Persistent<v8::Object>* obj,
-                          bool* data) {
-  obj->Reset();
-  *(data) = true;
+static void ForceScavenge(
+    const v8::WeakCallbackData<v8::Object,
+                               pair<v8::Persistent<v8::Object>*,
+                                    bool> >& data) {
+  data.GetParameter()->first->Reset();
+  data.GetParameter()->second = true;
   InvokeScavenge();
 }
 
 
-static void ForceMarkSweep(v8::Isolate* isolate,
-                           v8::Persistent<v8::Object>* obj,
-                           bool* data) {
-  obj->Reset();
-  *(data) = true;
+static void ForceMarkSweep(
+    const v8::WeakCallbackData<v8::Object,
+                               pair<v8::Persistent<v8::Object>*,
+                                    bool> >& data) {
+  data.GetParameter()->first->Reset();
+  data.GetParameter()->second = true;
   InvokeMarkSweep();
 }
 
 
 THREADED_TEST(GCFromWeakCallbacks) {
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope scope(isolate);
   v8::Handle<Context> context = Context::New(isolate);
   Context::Scope context_scope(context);
 
   static const int kNumberOfGCTypes = 2;
-  typedef v8::WeakReferenceCallbacks<v8::Object, bool>::Revivable Callback;
+  typedef v8::WeakCallbackData<v8::Object,
+                               pair<v8::Persistent<v8::Object>*,
+                                    bool> >::Callback Callback;
   Callback gc_forcing_callback[kNumberOfGCTypes] =
       {&ForceScavenge, &ForceMarkSweep};
 
   typedef void (*GCInvoker)();
   GCInvoker invoke_gc[kNumberOfGCTypes] = {&InvokeScavenge, &InvokeMarkSweep};
 
   for (int outer_gc = 0; outer_gc < kNumberOfGCTypes; outer_gc++) {
     for (int inner_gc = 0; inner_gc < kNumberOfGCTypes; inner_gc++) {
       v8::Persistent<v8::Object> object;
       {
         v8::HandleScope handle_scope(isolate);
         object.Reset(isolate, v8::Object::New());
       }
-      bool disposed = false;
-      object.MakeWeak(&disposed, gc_forcing_callback[inner_gc]);
+      pair<v8::Persistent<v8::Object>*, bool> object_pair(&object, false);
+      object.SetWeak(&object_pair, gc_forcing_callback[inner_gc]);
       object.MarkIndependent();
       invoke_gc[outer_gc]();
-      CHECK(disposed);
+      CHECK(object_pair.second);
     }
   }
 }
 
 
-static void RevivingCallback(v8::Isolate* isolate,
-                             v8::Persistent<v8::Object>* obj,
-                             bool* data) {
-  obj->ClearWeak();
-  *(data) = true;
+static void RevivingCallback(
+    const v8::WeakCallbackData<v8::Object,
+                               std::pair<v8::Persistent<Object>*,
+                                         bool> >& data) {
+  data.GetParameter()->first->ClearWeak();
+  data.GetParameter()->second = true;
 }
 
 
 THREADED_TEST(IndependentHandleRevival) {
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope scope(isolate);
   v8::Handle<Context> context = Context::New(isolate);
   Context::Scope context_scope(context);
 
   v8::Persistent<v8::Object> object;
   {
     v8::HandleScope handle_scope(isolate);
     v8::Local<v8::Object> o = v8::Object::New();
     object.Reset(isolate, o);
     o->Set(v8_str("x"), v8::Integer::New(1));
     v8::Local<String> y_str = v8_str("y");
     o->Set(y_str, y_str);
   }
-  bool revived = false;
-  object.MakeWeak(&revived, &RevivingCallback);
+  pair<v8::Persistent<v8::Object>*, bool> revived(&object, false);
+  object.SetWeak(&revived, &RevivingCallback);
   object.MarkIndependent();
   CcTest::heap()->PerformScavenge();
-  CHECK(revived);
+  CHECK(revived.second);
   CcTest::heap()->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask);
   {
     v8::HandleScope handle_scope(isolate);
     v8::Local<v8::Object> o = v8::Local<v8::Object>::New(isolate, object);
     v8::Local<String> y_str = v8_str("y");
     CHECK_EQ(v8::Integer::New(1), o->Get(v8_str("x")));
     CHECK(o->Get(y_str)->Equals(y_str));
   }
 }
 
@@ skipping 5937 matching lines @@
   reinterpret_cast<i::Isolate*>(isolate)->heap()->
       CollectAllGarbage(i::Heap::kNoGCFlags);
   // Verify disposed.
   CHECK_EQ(initial_handles, globals->global_handles_count());
 }
 
 
 v8::Persistent<v8::Object> some_object;
 v8::Persistent<v8::Object> bad_handle;
 
-void NewPersistentHandleCallback(v8::Isolate* isolate,
-                                 v8::Persistent<v8::Value>* handle,
-                                 void*) {
-  v8::HandleScope scope(isolate);
-  bad_handle.Reset(isolate, some_object);
-  handle->Reset();
+void NewPersistentHandleCallback(
+    const v8::WeakCallbackData<v8::Object, v8::Persistent<v8::Object> >& data) {
+  v8::HandleScope scope(data.GetIsolate());
+  bad_handle.Reset(data.GetIsolate(), some_object);
+  data.GetParameter()->Reset();
 }
 
 
 THREADED_TEST(NewPersistentHandleFromWeakCallback) {
   LocalContext context;
   v8::Isolate* isolate = context->GetIsolate();
 
   v8::Persistent<v8::Object> handle1, handle2;
   {
     v8::HandleScope scope(isolate);
     some_object.Reset(isolate, v8::Object::New());
     handle1.Reset(isolate, v8::Object::New());
     handle2.Reset(isolate, v8::Object::New());
   }
   // Note: order is implementation dependent alas: currently
   // global handle nodes are processed by PostGarbageCollectionProcessing
   // in reverse allocation order, so if second allocated handle is deleted,
   // weak callback of the first handle would be able to 'reallocate' it.
-  handle1.MakeWeak<v8::Value, void>(NULL, NewPersistentHandleCallback);
+  handle1.SetWeak(&handle1, NewPersistentHandleCallback);
   handle2.Reset();
   CcTest::heap()->CollectAllGarbage(i::Heap::kNoGCFlags);
 }
 
 
 v8::Persistent<v8::Object> to_be_disposed;
 
-void DisposeAndForceGcCallback(v8::Isolate* isolate,
-                               v8::Persistent<v8::Value>* handle,
-                               void*) {
+void DisposeAndForceGcCallback(
+    const v8::WeakCallbackData<v8::Object, v8::Persistent<v8::Object> >& data) {
   to_be_disposed.Reset();
   CcTest::heap()->CollectAllGarbage(i::Heap::kNoGCFlags);
-  handle->Reset();
+  data.GetParameter()->Reset();
 }
 
 
 THREADED_TEST(DoNotUseDeletedNodesInSecondLevelGc) {
   LocalContext context;
   v8::Isolate* isolate = context->GetIsolate();
 
   v8::Persistent<v8::Object> handle1, handle2;
   {
     v8::HandleScope scope(isolate);
     handle1.Reset(isolate, v8::Object::New());
     handle2.Reset(isolate, v8::Object::New());
   }
-  handle1.MakeWeak<v8::Value, void>(NULL, DisposeAndForceGcCallback);
+  handle1.SetWeak(&handle1, DisposeAndForceGcCallback);
   to_be_disposed.Reset(isolate, handle2);
   CcTest::heap()->CollectAllGarbage(i::Heap::kNoGCFlags);
 }
 
-void DisposingCallback(v8::Isolate* isolate,
-                       v8::Persistent<v8::Value>* handle,
-                       void*) {
-  handle->Reset();
+void DisposingCallback(
+    const v8::WeakCallbackData<v8::Object, v8::Persistent<v8::Object> >& data) {
+  data.GetParameter()->Reset();
 }
 
-void HandleCreatingCallback(v8::Isolate* isolate,
-                            v8::Persistent<v8::Value>* handle,
-                            void*) {
-  v8::HandleScope scope(isolate);
-  v8::Persistent<v8::Object>(isolate, v8::Object::New());
-  handle->Reset();
+void HandleCreatingCallback(
+    const v8::WeakCallbackData<v8::Object, v8::Persistent<v8::Object> >& data) {
+  v8::HandleScope scope(data.GetIsolate());
+  v8::Persistent<v8::Object>(data.GetIsolate(), v8::Object::New());
+  data.GetParameter()->Reset();
 }
 
 
 THREADED_TEST(NoGlobalHandlesOrphaningDueToWeakCallback) {
   LocalContext context;
   v8::Isolate* isolate = context->GetIsolate();
 
   v8::Persistent<v8::Object> handle1, handle2, handle3;
   {
     v8::HandleScope scope(isolate);
     handle3.Reset(isolate, v8::Object::New());
     handle2.Reset(isolate, v8::Object::New());
     handle1.Reset(isolate, v8::Object::New());
   }
-  handle2.MakeWeak<v8::Value, void>(NULL, DisposingCallback);
-  handle3.MakeWeak<v8::Value, void>(NULL, HandleCreatingCallback);
+  handle2.SetWeak(&handle2, DisposingCallback);
+  handle3.SetWeak(&handle3, HandleCreatingCallback);
   CcTest::heap()->CollectAllGarbage(i::Heap::kNoGCFlags);
 }
 
 
 THREADED_TEST(CheckForCrossContextObjectLiterals) {
   v8::V8::Initialize();
 
   const int nof = 2;
   const char* sources[nof] = {
     "try { [ 2, 3, 4 ].forEach(5); } catch(e) { e.toString(); }",
@@ skipping 7651 matching lines @@
   }
   for (int i = 0; i < runs; i++) {
     Local<String> expected;
     if (i != 0) {
       CHECK_EQ(v8_str("escape value"), values[i]);
     } else {
       CHECK(values[i].IsEmpty());
     }
   }
 }