Skip to content

src: pass along errors from object instantiations #25734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
addaleax wants to merge 7 commits into from
Closed

src: pass along errors from object instantiations #25734

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a175796
src: pass along errors from PromiseWrap instantiation
addaleax Jan 27, 2019
eb736bc
src: pass along errors from stream obj instantiation
addaleax Jan 27, 2019
0f1d6a4
src: pass along errors from process obj instantiation
addaleax Jan 27, 2019
f78631c
src: pass along errors from perf obj instantiation
addaleax Jan 27, 2019
6a68457
src: pass along errors from KeyObject instantiation
addaleax Jan 27, 2019
69d02c8
src: pass along errors from vm data wrapper creation
addaleax Jan 27, 2019
7f2c06c
src: pass along errors from i18n converter instantiation
addaleax Jan 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
src: pass along errors from PromiseWrap instantiation
  • Loading branch information
@addaleax
addaleax committed Jan 27, 2019
commit a175796984baa53de421e5e756f9e69d40ad00c9
20 changes: 11 additions & 9 deletions src/async_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,15 @@ PromiseWrap* PromiseWrap::New(Environment* env,
Local<Promise> promise,
PromiseWrap* parent_wrap,
bool silent) {
Local<Object> object = env->promise_wrap_template()
->NewInstance(env->context()).ToLocalChecked();
object->SetInternalField(PromiseWrap::kIsChainedPromiseField,
parent_wrap != nullptr ?
v8::True(env->isolate()) :
v8::False(env->isolate()));
Local<Object> obj;
if (!env->promise_wrap_template()->NewInstance(env->context()).ToLocal(&obj))
return nullptr;
obj->SetInternalField(PromiseWrap::kIsChainedPromiseField,
parent_wrap != nullptr ? v8::True(env->isolate())
: v8::False(env->isolate()));
CHECK_EQ(promise->GetAlignedPointerFromInternalField(0), nullptr);
promise->SetInternalField(0, object);
return new PromiseWrap(env, object, silent);
promise->SetInternalField(0, obj);
return new PromiseWrap(env, obj, silent);
}

void PromiseWrap::getIsChainedPromise(Local<String> property,
Expand Down Expand Up @@ -242,6 +242,7 @@ static void PromiseHook(PromiseHookType type, Local<Promise> promise,
PromiseWrap* parent_wrap = extractPromiseWrap(parent_promise);
if (parent_wrap == nullptr) {
parent_wrap = PromiseWrap::New(env, parent_promise, nullptr, true);
if (parent_wrap == nullptr) return;
}

AsyncHooks::DefaultTriggerAsyncIdScope trigger_scope(parent_wrap);
Expand All @@ -251,7 +252,8 @@ static void PromiseHook(PromiseHookType type, Local<Promise> promise,
}
}

CHECK_NOT_NULL(wrap);
if (wrap == nullptr) return;

if (type == PromiseHookType::kBefore) {
env->async_hooks()->push_async_ids(
wrap->get_async_id(), wrap->get_trigger_async_id());
Expand Down