src: use PersistentToLocal() in a few more places

bnoordhuis · bnoordhuis · commit d4cc30f18c2b · 2013-08-03T22:23:28.000+02:00
Update a few more `Local&lt;T&gt;::New(isolate, persistent)` call sites to
`PersistentToLocal(isolate, persistent)` - the latter has a fast path
for non-weak persistent references.
diff --git a/src/handle_wrap.h b/src/handle_wrap.h
@@ -69,7 +69,7 @@ class HandleWrap {
   virtual ~HandleWrap();
 
   inline v8::Local<v8::Object> object() {
-    return v8::Local<v8::Object>::New(node_isolate, persistent());
+    return PersistentToLocal(node_isolate, persistent());
   }
 
   inline v8::Persistent<v8::Object>& persistent() {
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -3315,6 +3315,9 @@ void EIO_PBKDF2After(uv_work_t* work_req, int status) {
   assert(status == 0);
   pbkdf2_req* req = container_of(work_req, pbkdf2_req, work_req);
   HandleScope scope(node_isolate);
+  // Create a new Local that's associated with the current HandleScope.
+  // PersistentToLocal() returns a handle that gets zeroed when we call
+  // Dispose() so don't use that.
   Local<Object> obj = Local<Object>::New(node_isolate, req->obj);
   req->obj.Dispose();
   Local<Value> argv[2];
diff --git a/src/node_script.cc b/src/node_script.cc
@@ -174,7 +174,7 @@ Local<Object> WrappedContext::NewInstance() {
 
 
 Local<Context> WrappedContext::GetV8Context() {
-  return Local<Context>::New(node_isolate, context_);
+  return PersistentToLocal(node_isolate, context_);
 }
 
 
@@ -404,7 +404,7 @@ void WrappedScript::EvalMachine(const FunctionCallbackInfo<Value>& args) {
           "'this' must be a result of previous new Script(code) call.");
     }
 
-    script = Local<Script>::New(node_isolate, n_script->script_);
+    script = PersistentToLocal(node_isolate, n_script->script_);
   }
 
   if (output_flag == returnResult) {
diff --git a/src/req_wrap.h b/src/req_wrap.h
@@ -22,6 +22,7 @@
 #ifndef SRC_REQ_WRAP_H_
 #define SRC_REQ_WRAP_H_
 
+#include "node.h"
 #include "queue.h"
 
 namespace node {
@@ -69,7 +70,7 @@ class ReqWrap {
   }
 
   inline v8::Local<v8::Object> object() {
-    return v8::Local<v8::Object>::New(node_isolate, persistent());
+    return PersistentToLocal(node_isolate, persistent());
   }
 
   inline v8::Persistent<v8::Object>& persistent() {
diff --git a/src/tls_wrap.h b/src/tls_wrap.h
@@ -22,9 +22,10 @@
 #ifndef SRC_TLS_WRAP_H_
 #define SRC_TLS_WRAP_H_
 
-#include "v8.h"
-#include "stream_wrap.h"
+#include "node.h"
 #include "queue.h"
+#include "stream_wrap.h"
+#include "v8.h"
 
 #include <openssl/ssl.h>
 
@@ -162,7 +163,7 @@ class TLSCallbacks : public StreamWrapCallbacks {
 #endif  // SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
 
   inline v8::Local<v8::Object> object() {
-    return v8::Local<v8::Object>::New(node_isolate, persistent());
+    return PersistentToLocal(node_isolate, persistent());
   }
 
   inline v8::Persistent<v8::Object>& persistent() {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class HandleWrap {`
`69`	`69`	`virtual ~HandleWrap();`
`70`	`70`
`71`	`71`	`inline v8::Local<v8::Object> object() {`
`72`		`- return v8::Local<v8::Object>::New(node_isolate, persistent());`
	`72`	`+ return PersistentToLocal(node_isolate, persistent());`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`inline v8::Persistent<v8::Object>& persistent() {`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ Local<Object> WrappedContext::NewInstance() {`
`174`	`174`
`175`	`175`
`176`	`176`	`Local<Context> WrappedContext::GetV8Context() {`
`177`		`- return Local<Context>::New(node_isolate, context_);`
	`177`	`+ return PersistentToLocal(node_isolate, context_);`
`178`	`178`	`}`
`179`	`179`
`180`	`180`
`@@ -404,7 +404,7 @@ void WrappedScript::EvalMachine(const FunctionCallbackInfo<Value>& args) {`
`404`	`404`	`"'this' must be a result of previous new Script(code) call.");`
`405`	`405`	`}`
`406`	`406`
`407`		`- script = Local<Script>::New(node_isolate, n_script->script_);`
	`407`	`+ script = PersistentToLocal(node_isolate, n_script->script_);`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`if (output_flag == returnResult) {`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#ifndef SRC_REQ_WRAP_H_`
`23`	`23`	`#define SRC_REQ_WRAP_H_`
`24`	`24`
	`25`	`+#include "node.h"`
`25`	`26`	`#include "queue.h"`
`26`	`27`
`27`	`28`	`namespace node {`
`@@ -69,7 +70,7 @@ class ReqWrap {`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`inline v8::Local<v8::Object> object() {`
`72`		`- return v8::Local<v8::Object>::New(node_isolate, persistent());`
	`73`	`+ return PersistentToLocal(node_isolate, persistent());`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`inline v8::Persistent<v8::Object>& persistent() {`