Fix Global::Pass for old versions

Fixes: #517
Reviewed-By: bnoordhuis

Author: kkoopa

nan_persistent_pre_12_inl.h

@@ -210,7 +210,7 @@ class Global : public PersistentBase<T> {
    * Move constructor.
    */
   NAN_INLINE Global(RValue rvalue)
-    : PersistentBase<T>(rvalue.object.persistent) {
+    : PersistentBase<T>(rvalue.object->persistent) {
     rvalue.object->Reset();
   }
   NAN_INLINE ~Global() { this->Reset(); }

test/cpp/persistent.cpp

@@ -15,7 +15,6 @@ static Persistent<v8::String> persistentTest1;
 
 NAN_METHOD(Save1) {
   persistentTest1.Reset(info[0].As<v8::String>());
-  info.GetReturnValue().SetUndefined();
 }
 
 NAN_METHOD(Get1) {
@@ -24,7 +23,6 @@ NAN_METHOD(Get1) {
 
 NAN_METHOD(Dispose1) {
   persistentTest1.Reset();
-  info.GetReturnValue().SetUndefined();
 }
 
 NAN_METHOD(ToPersistentAndBackAgain) {
@@ -39,8 +37,8 @@ NAN_METHOD(PersistentToPersistent) {
   Persistent<v8::String> persistent(info[0].As<v8::String>());
   persistentTest1.Reset(persistent);
   persistent.Reset();
+  info.GetReturnValue().Set(New(persistentTest1));
   persistentTest1.Reset();
-  info.GetReturnValue().SetUndefined();
 }
 
 NAN_METHOD(CopyablePersistent) {
@@ -49,30 +47,46 @@ NAN_METHOD(CopyablePersistent) {
   info.GetReturnValue().Set(New(p));
 }
 
+template<typename T> Global<T> passer(v8::Local<T> handle) {
+  return Global<T>(handle).Pass();
+}
+
+NAN_METHOD(PassGlobal) {
+  info.GetReturnValue().Set(passer(New(42)));
+}
+
 NAN_MODULE_INIT(Init) {
   Set(target
     , New<v8::String>("save1").ToLocalChecked()
-    , New<v8::FunctionTemplate>(Save1)->GetFunction()
+    , GetFunction(New<v8::FunctionTemplate>(Save1)).ToLocalChecked()
   );
   Set(target
     , New<v8::String>("get1").ToLocalChecked()
-    , New<v8::FunctionTemplate>(Get1)->GetFunction()
+    , GetFunction(New<v8::FunctionTemplate>(Get1)).ToLocalChecked()
   );
   Set(target
     , New<v8::String>("dispose1").ToLocalChecked()
-    , New<v8::FunctionTemplate>(Dispose1)->GetFunction()
+    , GetFunction(New<v8::FunctionTemplate>(Dispose1)).ToLocalChecked()
   );
   Set(target
     , New<v8::String>("toPersistentAndBackAgain").ToLocalChecked()
-    , New<v8::FunctionTemplate>(ToPersistentAndBackAgain)->GetFunction()
+    , GetFunction(New<v8::FunctionTemplate>(ToPersistentAndBackAgain))
+        .ToLocalChecked()
   );
   Set(target
     , New<v8::String>("persistentToPersistent").ToLocalChecked()
-    , New<v8::FunctionTemplate>(PersistentToPersistent)->GetFunction()
+    , GetFunction(New<v8::FunctionTemplate>(PersistentToPersistent))
+        .ToLocalChecked()
   );
   Set(target
     , New<v8::String>("copyablePersistent").ToLocalChecked()
-    , New<v8::FunctionTemplate>(CopyablePersistent)->GetFunction()
+    , GetFunction(New<v8::FunctionTemplate>(CopyablePersistent))
+        .ToLocalChecked()
+  );
+  Set(target
+    , New<v8::String>("passGlobal").ToLocalChecked()
+    , GetFunction(New<v8::FunctionTemplate>(PassGlobal))
+        .ToLocalChecked()
   );
 }
 

test/js/persistent-test.js

@@ -11,7 +11,7 @@ const test     = require('tap').test
     , bindings = require('bindings')({ module_root: testRoot, bindings: 'persistent' });
 
 test('persistent', function (t) {
-  t.plan(14);
+  t.plan(15);
 
   var persistent = bindings;
   t.type(persistent.save1, 'function');
@@ -20,26 +20,22 @@ test('persistent', function (t) {
   t.type(persistent.toPersistentAndBackAgain, 'function');
   t.type(persistent.persistentToPersistent, 'function');
   t.type(persistent.copyablePersistent, 'function');
+  t.type(persistent.passGlobal, 'function');
+
   t.deepEqual(persistent.toPersistentAndBackAgain({ x: 42 }), { x: 42 });
 
-  t.ok(persistent.persistentToPersistent('any string') || true);
+  t.equal(persistent.persistentToPersistent('any string'), 'any string');
 
   persistent.save1('a string to save');
   t.equal(persistent.get1(), 'a string to save');
+  t.equal(persistent.copyablePersistent(), 'a string to save');
+
+  t.equal(persistent.passGlobal(), 42, 'pass global');
+
   setTimeout(function () {
     t.equal(persistent.get1(), 'a string to save');
-  }, 25);
-  setTimeout(function () {
-    t.equal(persistent.get1(), 'a string to save');
-  }, 50);
-  setTimeout(function () {
-    t.equal(persistent.copyablePersistent(), 'a string to save');
-  }, 75);
-  setTimeout(function () {
     persistent.dispose1();
-  }, 75);
-  setTimeout(function () {
     t.ok(persistent.get1() === undefined, 'no more persistent');
     t.ok(persistent.copyablePersistent() === undefined, 'no more persistent');
-  }, 100);
+  }, 25);
 });