| Index: src/runtime/runtime-internal.cc
|
| diff --git a/src/runtime/runtime-internal.cc b/src/runtime/runtime-internal.cc
|
| index d0de86927400ed710cb5aa1bfcb2d80793ea115a..621f33547e80736b59fdb7d928a3c16ad1ed5fba 100644
|
| --- a/src/runtime/runtime-internal.cc
|
| +++ b/src/runtime/runtime-internal.cc
|
| @@ -11,7 +11,6 @@
|
| #include "src/bootstrapper.h"
|
| #include "src/conversions.h"
|
| #include "src/debug/debug.h"
|
| -#include "src/elements.h"
|
| #include "src/frames-inl.h"
|
| #include "src/isolate-inl.h"
|
| #include "src/messages.h"
|
| @@ -288,64 +287,6 @@ RUNTIME_FUNCTION(Runtime_ThrowApplyNonFunction) {
|
| isolate, NewTypeError(MessageTemplate::kApplyNonFunction, object, type));
|
| }
|
|
|
| -namespace {
|
| -
|
| -void PromiseRejectEvent(Isolate* isolate, Handle<JSObject> promise,
|
| - Handle<Object> rejected_promise, Handle<Object> value,
|
| - bool debug_event) {
|
| - if (isolate->debug()->is_active() && debug_event) {
|
| - isolate->debug()->OnPromiseReject(rejected_promise, value);
|
| - }
|
| - Handle<Symbol> key = isolate->factory()->promise_has_handler_symbol();
|
| - // Do not report if we actually have a handler.
|
| - if (JSReceiver::GetDataProperty(promise, key)->IsUndefined(isolate)) {
|
| - isolate->ReportPromiseReject(promise, value,
|
| - v8::kPromiseRejectWithNoHandler);
|
| - }
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -RUNTIME_FUNCTION(Runtime_PromiseRejectEvent) {
|
| - DCHECK(args.length() == 3);
|
| - HandleScope scope(isolate);
|
| - CONVERT_ARG_HANDLE_CHECKED(JSObject, promise, 0);
|
| - CONVERT_ARG_HANDLE_CHECKED(Object, value, 1);
|
| - CONVERT_BOOLEAN_ARG_CHECKED(debug_event, 2);
|
| -
|
| - PromiseRejectEvent(isolate, promise, promise, value, debug_event);
|
| - return isolate->heap()->undefined_value();
|
| -}
|
| -
|
| -RUNTIME_FUNCTION(Runtime_PromiseRejectEventFromStack) {
|
| - DCHECK(args.length() == 2);
|
| - HandleScope scope(isolate);
|
| - CONVERT_ARG_HANDLE_CHECKED(JSObject, promise, 0);
|
| - CONVERT_ARG_HANDLE_CHECKED(Object, value, 1);
|
| -
|
| - Handle<Object> rejected_promise = promise;
|
| - if (isolate->debug()->is_active()) {
|
| - // If the Promise.reject call is caught, then this will return
|
| - // undefined, which will be interpreted by PromiseRejectEvent
|
| - // as being a caught exception event.
|
| - rejected_promise = isolate->GetPromiseOnStackOnThrow();
|
| - }
|
| - PromiseRejectEvent(isolate, promise, rejected_promise, value, true);
|
| - return isolate->heap()->undefined_value();
|
| -}
|
| -
|
| -RUNTIME_FUNCTION(Runtime_PromiseRevokeReject) {
|
| - DCHECK(args.length() == 1);
|
| - HandleScope scope(isolate);
|
| - CONVERT_ARG_HANDLE_CHECKED(JSObject, promise, 0);
|
| - Handle<Symbol> key = isolate->factory()->promise_has_handler_symbol();
|
| - // At this point, no revocation has been issued before
|
| - CHECK(JSReceiver::GetDataProperty(promise, key)->IsUndefined(isolate));
|
| - isolate->ReportPromiseReject(promise, Handle<Object>(),
|
| - v8::kPromiseHandlerAddedAfterReject);
|
| - return isolate->heap()->undefined_value();
|
| -}
|
| -
|
|
|
| RUNTIME_FUNCTION(Runtime_StackGuard) {
|
| SealHandleScope shs(isolate);
|
| @@ -572,128 +513,6 @@ RUNTIME_FUNCTION(Runtime_GetAndResetRuntimeCallStats) {
|
| }
|
| }
|
|
|
| -namespace {
|
| -void EnqueuePromiseReactionJob(Isolate* isolate, Handle<Object> value,
|
| - Handle<Object> tasks, Handle<Object> deferred,
|
| - Handle<Object> status) {
|
| - Handle<Object> debug_id = isolate->factory()->undefined_value();
|
| - Handle<Object> debug_name = isolate->factory()->undefined_value();
|
| - if (isolate->debug()->is_active()) {
|
| - MaybeHandle<Object> maybe_result;
|
| - Handle<Object> argv[] = {deferred, status};
|
| - maybe_result = Execution::TryCall(
|
| - isolate, isolate->promise_debug_get_info(),
|
| - isolate->factory()->undefined_value(), arraysize(argv), argv);
|
| - Handle<Object> result;
|
| - if ((maybe_result).ToHandle(&result)) {
|
| - CHECK(result->IsJSArray());
|
| - Handle<JSArray> array = Handle<JSArray>::cast(result);
|
| - ElementsAccessor* accessor = array->GetElementsAccessor();
|
| - DCHECK(accessor->HasElement(array, 0));
|
| - DCHECK(accessor->HasElement(array, 1));
|
| - debug_id = accessor->Get(array, 0);
|
| - debug_name = accessor->Get(array, 1);
|
| - }
|
| - }
|
| - Handle<PromiseReactionJobInfo> info =
|
| - isolate->factory()->NewPromiseReactionJobInfo(value, tasks, deferred,
|
| - debug_id, debug_name,
|
| - isolate->native_context());
|
| - isolate->EnqueueMicrotask(info);
|
| -}
|
| -
|
| -void PromiseFulfill(Isolate* isolate, Handle<JSReceiver> promise,
|
| - Handle<Smi> status, Handle<Object> value,
|
| - Handle<Symbol> reaction) {
|
| - Handle<Object> tasks = JSReceiver::GetDataProperty(promise, reaction);
|
| - if (!tasks->IsUndefined(isolate)) {
|
| - Handle<Object> deferred = JSReceiver::GetDataProperty(
|
| - promise, isolate->factory()->promise_deferred_reaction_symbol());
|
| - EnqueuePromiseReactionJob(isolate, value, tasks, deferred, status);
|
| - }
|
| -}
|
| -} // namespace
|
| -
|
| -RUNTIME_FUNCTION(Runtime_PromiseReject) {
|
| - DCHECK(args.length() == 3);
|
| - HandleScope scope(isolate);
|
| - CONVERT_ARG_HANDLE_CHECKED(JSObject, promise, 0);
|
| - CONVERT_ARG_HANDLE_CHECKED(Object, reason, 1);
|
| - CONVERT_BOOLEAN_ARG_CHECKED(debug_event, 2);
|
| -
|
| - PromiseRejectEvent(isolate, promise, promise, reason, debug_event);
|
| -
|
| - Handle<Smi> status = handle(Smi::FromInt(kPromiseRejected), isolate);
|
| - Handle<Symbol> reaction =
|
| - isolate->factory()->promise_reject_reactions_symbol();
|
| - PromiseFulfill(isolate, promise, status, reason, reaction);
|
| - return isolate->heap()->undefined_value();
|
| -}
|
| -
|
| -RUNTIME_FUNCTION(Runtime_PromiseFulfill) {
|
| - DCHECK(args.length() == 4);
|
| - HandleScope scope(isolate);
|
| - CONVERT_ARG_HANDLE_CHECKED(JSReceiver, promise, 0);
|
| - CONVERT_ARG_HANDLE_CHECKED(Smi, status, 1);
|
| - CONVERT_ARG_HANDLE_CHECKED(Object, value, 2);
|
| - CONVERT_ARG_HANDLE_CHECKED(Symbol, reaction, 3);
|
| - PromiseFulfill(isolate, promise, status, value, reaction);
|
| - return isolate->heap()->undefined_value();
|
| -}
|
| -
|
| -RUNTIME_FUNCTION(Runtime_EnqueuePromiseReactionJob) {
|
| - HandleScope scope(isolate);
|
| - DCHECK(args.length() == 4);
|
| - CONVERT_ARG_HANDLE_CHECKED(Object, value, 0);
|
| - CONVERT_ARG_HANDLE_CHECKED(Object, tasks, 1);
|
| - CONVERT_ARG_HANDLE_CHECKED(Object, deferred, 2);
|
| - CONVERT_ARG_HANDLE_CHECKED(Object, status, 3);
|
| - EnqueuePromiseReactionJob(isolate, value, tasks, deferred, status);
|
| - return isolate->heap()->undefined_value();
|
| -}
|
| -
|
| -RUNTIME_FUNCTION(Runtime_EnqueuePromiseResolveThenableJob) {
|
| - HandleScope scope(isolate);
|
| - DCHECK(args.length() == 4);
|
| - CONVERT_ARG_HANDLE_CHECKED(JSReceiver, resolution, 0);
|
| - CONVERT_ARG_HANDLE_CHECKED(JSReceiver, then, 1);
|
| - CONVERT_ARG_HANDLE_CHECKED(JSFunction, resolve, 2);
|
| - CONVERT_ARG_HANDLE_CHECKED(JSFunction, reject, 3);
|
| - Handle<Object> debug_id;
|
| - Handle<Object> debug_name;
|
| - if (isolate->debug()->is_active()) {
|
| - debug_id =
|
| - handle(Smi::FromInt(isolate->GetNextDebugMicrotaskId()), isolate);
|
| - debug_name = isolate->factory()->PromiseResolveThenableJob_string();
|
| - isolate->debug()->OnAsyncTaskEvent(isolate->factory()->enqueue_string(),
|
| - debug_id,
|
| - Handle<String>::cast(debug_name));
|
| - } else {
|
| - debug_id = isolate->factory()->undefined_value();
|
| - debug_name = isolate->factory()->undefined_value();
|
| - }
|
| - Handle<PromiseResolveThenableJobInfo> info =
|
| - isolate->factory()->NewPromiseResolveThenableJobInfo(
|
| - resolution, then, resolve, reject, debug_id, debug_name);
|
| - isolate->EnqueueMicrotask(info);
|
| - return isolate->heap()->undefined_value();
|
| -}
|
| -
|
| -RUNTIME_FUNCTION(Runtime_EnqueueMicrotask) {
|
| - HandleScope scope(isolate);
|
| - DCHECK(args.length() == 1);
|
| - CONVERT_ARG_HANDLE_CHECKED(JSFunction, microtask, 0);
|
| - isolate->EnqueueMicrotask(microtask);
|
| - return isolate->heap()->undefined_value();
|
| -}
|
| -
|
| -RUNTIME_FUNCTION(Runtime_RunMicrotasks) {
|
| - HandleScope scope(isolate);
|
| - DCHECK(args.length() == 0);
|
| - isolate->RunMicrotasks();
|
| - return isolate->heap()->undefined_value();
|
| -}
|
| -
|
| RUNTIME_FUNCTION(Runtime_OrdinaryHasInstance) {
|
| HandleScope scope(isolate);
|
| DCHECK_EQ(2, args.length());
|
|
|