1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: return MaybeLocal in AsyncWrap::MakeCallback

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/14549
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Tobias Nießen 2017-07-31 02:05:20 +02:00
parent 1c362436b7
commit 98bae29304
5 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/async-wrap-inl.h
View File

@ -51,7 +51,7 @@ inline double AsyncWrap::get_trigger_id() const {
} }
inline v8::Local<v8::Value> AsyncWrap::MakeCallback( inline v8::MaybeLocal<v8::Value> AsyncWrap::MakeCallback(
const v8::Local<v8::String> symbol, const v8::Local<v8::String> symbol,
int argc, int argc,
v8::Local<v8::Value>* argv) { v8::Local<v8::Value>* argv) {
@ -61,7 +61,7 @@ inline v8::Local<v8::Value> AsyncWrap::MakeCallback(
} }
inline v8::Local<v8::Value> AsyncWrap::MakeCallback( inline v8::MaybeLocal<v8::Value> AsyncWrap::MakeCallback(
uint32_t index, uint32_t index,
int argc, int argc,
v8::Local<v8::Value>* argv) { v8::Local<v8::Value>* argv) {

19
src/async-wrap.cc
View File

@ -673,9 +673,9 @@ void AsyncWrap::EmitAsyncInit(Environment* env,
} }
Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb, MaybeLocal<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
int argc, int argc,
Local<Value>* argv) { Local<Value>* argv) {
CHECK(env()->context() == env()->isolate()->GetCurrentContext()); CHECK(env()->context() == env()->isolate()->GetCurrentContext());
Environment::AsyncCallbackScope callback_scope(env()); Environment::AsyncCallbackScope callback_scope(env());
@ -685,15 +685,14 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
get_trigger_id()); get_trigger_id());
if (!PreCallbackExecution(this, true)) { if (!PreCallbackExecution(this, true)) {
return Local<Value>(); return MaybeLocal<Value>();
} }
// Finally... Get to running the user's callback. // Finally... Get to running the user's callback.
MaybeLocal<Value> ret = cb->Call(env()->context(), object(), argc, argv); MaybeLocal<Value> ret = cb->Call(env()->context(), object(), argc, argv);
Local<Value> ret_v; if (ret.IsEmpty()) {
if (!ret.ToLocal(&ret_v)) { return ret;
return Local<Value>();
} }
if (!PostCallbackExecution(this, true)) { if (!PostCallbackExecution(this, true)) {
@ -703,7 +702,7 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
exec_scope.Dispose(); exec_scope.Dispose();
if (callback_scope.in_makecallback()) { if (callback_scope.in_makecallback()) {
return ret_v; return ret;
} }
Environment::TickInfo* tick_info = env()->tick_info(); Environment::TickInfo* tick_info = env()->tick_info();
@ -721,7 +720,7 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
if (tick_info->length() == 0) { if (tick_info->length() == 0) {
tick_info->set_index(0); tick_info->set_index(0);
return ret_v; return ret;
} }
MaybeLocal<Value> rcheck = MaybeLocal<Value> rcheck =
@ -734,7 +733,7 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
CHECK_EQ(env()->current_async_id(), 0); CHECK_EQ(env()->current_async_id(), 0);
CHECK_EQ(env()->trigger_id(), 0); CHECK_EQ(env()->trigger_id(), 0);
return rcheck.IsEmpty() ? Local<Value>() : ret_v; return rcheck.IsEmpty() ? MaybeLocal<Value>() : ret;
} }

20
src/async-wrap.h
View File

@ -121,16 +121,16 @@ class AsyncWrap : public BaseObject {
void AsyncReset(bool silent = false); void AsyncReset(bool silent = false);
// Only call these within a valid HandleScope. // Only call these within a valid HandleScope.
// TODO(trevnorris): These should return a MaybeLocal. v8::MaybeLocal<v8::Value> MakeCallback(const v8::Local<v8::Function> cb,
v8::Local<v8::Value> MakeCallback(const v8::Local<v8::Function> cb, int argc,
int argc, v8::Local<v8::Value>* argv);
v8::Local<v8::Value>* argv); inline v8::MaybeLocal<v8::Value> MakeCallback(
inline v8::Local<v8::Value> MakeCallback(const v8::Local<v8::String> symbol, const v8::Local<v8::String> symbol,
int argc, int argc,
v8::Local<v8::Value>* argv); v8::Local<v8::Value>* argv);
inline v8::Local<v8::Value> MakeCallback(uint32_t index, inline v8::MaybeLocal<v8::Value> MakeCallback(uint32_t index,
int argc, int argc,
v8::Local<v8::Value>* argv); v8::Local<v8::Value>* argv);
virtual size_t self_size() const = 0; virtual size_t self_size() const = 0;

21
src/js_stream.cc
View File

@ -16,6 +16,7 @@ using v8::FunctionCallbackInfo;
using v8::FunctionTemplate; using v8::FunctionTemplate;
using v8::HandleScope; using v8::HandleScope;
using v8::Local; using v8::Local;
using v8::MaybeLocal;
using v8::Object; using v8::Object;
using v8::Value; using v8::Value;
@ -46,22 +47,26 @@ bool JSStream::IsAlive() {
v8::Local<v8::Value> fn = object()->Get(env()->isalive_string()); v8::Local<v8::Value> fn = object()->Get(env()->isalive_string());
if (!fn->IsFunction()) if (!fn->IsFunction())
return false; return false;
return MakeCallback(fn.As<v8::Function>(), 0, nullptr)->IsTrue(); return MakeCallback(fn.As<v8::Function>(), 0, nullptr)
.ToLocalChecked()->IsTrue();
} }
bool JSStream::IsClosing() { bool JSStream::IsClosing() {
return MakeCallback(env()->isclosing_string(), 0, nullptr)->IsTrue(); return MakeCallback(env()->isclosing_string(), 0, nullptr)
.ToLocalChecked()->IsTrue();
} }
int JSStream::ReadStart() { int JSStream::ReadStart() {
return MakeCallback(env()->onreadstart_string(), 0, nullptr)->Int32Value(); return MakeCallback(env()->onreadstart_string(), 0, nullptr)
.ToLocalChecked()->Int32Value();
} }
int JSStream::ReadStop() { int JSStream::ReadStop() {
return MakeCallback(env()->onreadstop_string(), 0, nullptr)->Int32Value(); return MakeCallback(env()->onreadstop_string(), 0, nullptr)
.ToLocalChecked()->Int32Value();
} }
@ -73,10 +78,10 @@ int JSStream::DoShutdown(ShutdownWrap* req_wrap) {
}; };
req_wrap->Dispatched(); req_wrap->Dispatched();
Local<Value> res = MaybeLocal<Value> res =
MakeCallback(env()->onshutdown_string(), arraysize(argv), argv); MakeCallback(env()->onshutdown_string(), arraysize(argv), argv);
return res->Int32Value(); return res.ToLocalChecked()->Int32Value();
} }
@ -101,10 +106,10 @@ int JSStream::DoWrite(WriteWrap* w,
}; };
w->Dispatched(); w->Dispatched();
Local<Value> res = MaybeLocal<Value> res =
MakeCallback(env()->onwrite_string(), arraysize(argv), argv); MakeCallback(env()->onwrite_string(), arraysize(argv), argv);
return res->Int32Value(); return res.ToLocalChecked()->Int32Value();
} }

15
src/node_http_parser.cc
View File

@ -62,6 +62,7 @@ using v8::FunctionTemplate;
using v8::HandleScope; using v8::HandleScope;
using v8::Integer; using v8::Integer;
using v8::Local; using v8::Local;
using v8::MaybeLocal;
using v8::Object; using v8::Object;
using v8::String; using v8::String;
using v8::Uint32; using v8::Uint32;
@ -308,7 +309,7 @@ class Parser : public AsyncWrap {
Environment::AsyncCallbackScope callback_scope(env()); Environment::AsyncCallbackScope callback_scope(env());
Local<Value> head_response = MaybeLocal<Value> head_response =
MakeCallback(cb.As<Function>(), arraysize(argv), argv); MakeCallback(cb.As<Function>(), arraysize(argv), argv);
if (head_response.IsEmpty()) { if (head_response.IsEmpty()) {
@ -316,7 +317,7 @@ class Parser : public AsyncWrap {
return -1; return -1;
} }
return head_response->IntegerValue(); return head_response.ToLocalChecked()->IntegerValue();
} }
@ -344,7 +345,9 @@ class Parser : public AsyncWrap {
Integer::NewFromUnsigned(env()->isolate(), length) Integer::NewFromUnsigned(env()->isolate(), length)
}; };
Local<Value> r = MakeCallback(cb.As<Function>(), arraysize(argv), argv); MaybeLocal<Value> r = MakeCallback(cb.As<Function>(),
arraysize(argv),
argv);
if (r.IsEmpty()) { if (r.IsEmpty()) {
got_exception_ = true; got_exception_ = true;
@ -369,7 +372,7 @@ class Parser : public AsyncWrap {
Environment::AsyncCallbackScope callback_scope(env()); Environment::AsyncCallbackScope callback_scope(env());
Local<Value> r = MakeCallback(cb.As<Function>(), 0, nullptr); MaybeLocal<Value> r = MakeCallback(cb.As<Function>(), 0, nullptr);
if (r.IsEmpty()) { if (r.IsEmpty()) {
got_exception_ = true; got_exception_ = true;
@ -702,7 +705,9 @@ class Parser : public AsyncWrap {
url_.ToString(env()) url_.ToString(env())
}; };
Local<Value> r = MakeCallback(cb.As<Function>(), arraysize(argv), argv); MaybeLocal<Value> r = MakeCallback(cb.As<Function>(),
arraysize(argv),
argv);
if (r.IsEmpty()) if (r.IsEmpty())
got_exception_ = true; got_exception_ = true;