AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[runtime] Cleaning up PromiseHook runtime functions

Browse Source 
- remove redundant checks
- use switch over PromiseHookType

Change-Id: I89a5328009634a7025feb77e22334773c2886868
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2224225
Reviewed-by: Sathya Gunasekaran  <gsathya@chromium.org>
Reviewed-by: Simon Zünd <szuend@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68210}
This commit is contained in:
Camillo Bruni 2020-06-02 10:39:43 +02:00 committed by Commit Bot
parent f3dd0f4803
commit e23f0aa694
2 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/execution/isolate.cc
View File

@ -4142,54 +4142,57 @@ void Isolate::RunPromiseHook(PromiseHookType type, Handle<JSPromise> promise,
void Isolate::RunPromiseHookForAsyncEventDelegate(PromiseHookType type,
Handle<JSPromise> promise) {
if (!async_event_delegate_) return;
if (type == PromiseHookType::kResolve) return;
if (type == PromiseHookType::kBefore) {
if (!promise->async_task_id()) return;
async_event_delegate_->AsyncEventOccurred(debug::kDebugWillHandle,
promise->async_task_id(), false);
} else if (type == PromiseHookType::kAfter) {
if (!promise->async_task_id()) return;
async_event_delegate_->AsyncEventOccurred(debug::kDebugDidHandle,
promise->async_task_id(), false);
} else {
DCHECK(type == PromiseHookType::kInit);
debug::DebugAsyncActionType type = debug::kDebugPromiseThen;
bool last_frame_was_promise_builtin = false;
JavaScriptFrameIterator it(this);
while (!it.done()) {
std::vector<Handle<SharedFunctionInfo>> infos;
it.frame()->GetFunctions(&infos);
for (size_t i = 1; i <= infos.size(); ++i) {
Handle<SharedFunctionInfo> info = infos[infos.size() - i];
if (info->IsUserJavaScript()) {
// We should not report PromiseThen and PromiseCatch which is called
// indirectly, e.g. Promise.all calls Promise.then internally.
if (last_frame_was_promise_builtin) {
if (!promise->async_task_id()) {
promise->set_async_task_id(++async_task_count_);
switch (type) {
case PromiseHookType::kResolve:
return;
case PromiseHookType::kBefore:
if (!promise->async_task_id()) return;
async_event_delegate_->AsyncEventOccurred(
debug::kDebugWillHandle, promise->async_task_id(), false);
break;
case PromiseHookType::kAfter:
if (!promise->async_task_id()) return;
async_event_delegate_->AsyncEventOccurred(
debug::kDebugDidHandle, promise->async_task_id(), false);
break;
case PromiseHookType::kInit:
debug::DebugAsyncActionType type = debug::kDebugPromiseThen;
bool last_frame_was_promise_builtin = false;
JavaScriptFrameIterator it(this);
while (!it.done()) {
std::vector<Handle<SharedFunctionInfo>> infos;
it.frame()->GetFunctions(&infos);
for (size_t i = 1; i <= infos.size(); ++i) {
Handle<SharedFunctionInfo> info = infos[infos.size() - i];
if (info->IsUserJavaScript()) {
// We should not report PromiseThen and PromiseCatch which is called
// indirectly, e.g. Promise.all calls Promise.then internally.
if (last_frame_was_promise_builtin) {
if (!promise->async_task_id()) {
promise->set_async_task_id(++async_task_count_);
}
async_event_delegate_->AsyncEventOccurred(
type, promise->async_task_id(), debug()->IsBlackboxed(info));
}
async_event_delegate_->AsyncEventOccurred(
type, promise->async_task_id(), debug()->IsBlackboxed(info));
return;
}
return;
}
last_frame_was_promise_builtin = false;
if (info->HasBuiltinId()) {
if (info->builtin_id() == Builtins::kPromisePrototypeThen) {
type = debug::kDebugPromiseThen;
last_frame_was_promise_builtin = true;
} else if (info->builtin_id() == Builtins::kPromisePrototypeCatch) {
type = debug::kDebugPromiseCatch;
last_frame_was_promise_builtin = true;
} else if (info->builtin_id() == Builtins::kPromisePrototypeFinally) {
type = debug::kDebugPromiseFinally;
last_frame_was_promise_builtin = true;
last_frame_was_promise_builtin = false;
if (info->HasBuiltinId()) {
if (info->builtin_id() == Builtins::kPromisePrototypeThen) {
type = debug::kDebugPromiseThen;
last_frame_was_promise_builtin = true;
} else if (info->builtin_id() == Builtins::kPromisePrototypeCatch) {
type = debug::kDebugPromiseCatch;
last_frame_was_promise_builtin = true;
} else if (info->builtin_id() ==
Builtins::kPromisePrototypeFinally) {
type = debug::kDebugPromiseFinally;
last_frame_was_promise_builtin = true;
}
}
}
it.Advance();
}
it.Advance();
}
}
}

12
src/runtime/runtime-promise.cc
View File

@ -217,10 +217,8 @@ RUNTIME_FUNCTION(Runtime_PromiseHookBefore) {
return ReadOnlyRoots(isolate).undefined_value();
Handle<JSPromise> promise = Handle<JSPromise>::cast(maybe_promise);
if (isolate->debug()->is_active()) isolate->PushPromise(promise);
if (promise->IsJSPromise()) {
isolate->RunPromiseHook(PromiseHookType::kBefore, promise,
isolate->factory()->undefined_value());
}
isolate->RunPromiseHook(PromiseHookType::kBefore, promise,
isolate->factory()->undefined_value());
return ReadOnlyRoots(isolate).undefined_value();
}
@ -232,10 +230,8 @@ RUNTIME_FUNCTION(Runtime_PromiseHookAfter) {
return ReadOnlyRoots(isolate).undefined_value();
Handle<JSPromise> promise = Handle<JSPromise>::cast(maybe_promise);
if (isolate->debug()->is_active()) isolate->PopPromise();
if (promise->IsJSPromise()) {
isolate->RunPromiseHook(PromiseHookType::kAfter, promise,
isolate->factory()->undefined_value());
}
isolate->RunPromiseHook(PromiseHookType::kAfter, promise,
isolate->factory()->undefined_value());
return ReadOnlyRoots(isolate).undefined_value();
}