[inspector] async stacks for Promise.then calls...

src/runtime/runtime-promise.cc

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include "src/runtime/runtime-utils.h"
 
 #include "src/debug/debug.h"
 #include "src/elements.h"
 #include "src/promise-utils.h"
 
 namespace v8 {
@@ skipping 25 matching lines @@
   HandleScope scope(isolate);
   CONVERT_ARG_HANDLE_CHECKED(JSPromise, 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();
+    isolate->debug()->OnAsyncTaskEvent(
+        debug::kDebugEnqueueRecurring,
+        isolate->debug()->NextAsyncTaskId(promise), kDebugPromiseReject);
   }
   PromiseRejectEvent(isolate, promise, rejected_promise, value, true);
   return isolate->heap()->undefined_value();
 }
 
 RUNTIME_FUNCTION(Runtime_PromiseRevokeReject) {
   DCHECK_EQ(1, args.length());
   HandleScope scope(isolate);
   CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
   // At this point, no revocation has been issued before
@@ skipping 44 matching lines @@
 
   // id can be Undefined or Smi.
   if (!id->IsSmi()) {
     return false;
   }
 
   *debug_id = Handle<Smi>::cast(id)->value();
   return true;
 }
 
 void SetDebugInfo(Isolate* isolate, Handle<PromiseReactionJobInfo> info,

[gsathya, 2017/01/09 19:24:35]

info->promise() == promise right? can we just reuse the promise from info

[kozy, 2017/01/10 00:11:38]

Done.

-                  int status) {
+                  Handle<JSPromise> promise, int status) {
   int id;
   PromiseDebugActionName name;
 
   if (GetDebugIdForAsyncFunction(isolate, info, &id)) {
     name = kDebugAsyncFunction;
   } else {
-    id = isolate->GetNextDebugMicrotaskId();
-
+    id = isolate->debug()->NextAsyncTaskId(promise);
     DCHECK(status != v8::Promise::kPending);
     name = status == v8::Promise::kFulfilled ? kDebugPromiseResolve
                                              : kDebugPromiseReject;
-
-    isolate->debug()->OnAsyncTaskEvent(kDebugEnqueue, id, name);
   }
 
   info->set_debug_id(id);
   info->set_debug_name(name);
 }
 
 void EnqueuePromiseReactionJob(Isolate* isolate,
                                Handle<PromiseReactionJobInfo> info,
-                               int status) {
+                               Handle<JSPromise> promise, int status) {
   if (isolate->debug()->is_active()) {
-    SetDebugInfo(isolate, info, status);
+    SetDebugInfo(isolate, info, promise, status);
   }
 
   isolate->EnqueueMicrotask(info);
 }
 
 void PromiseSet(Isolate* isolate, Handle<JSPromise> promise, int status,
                 Handle<Object> result) {
   promise->set_status(status);
   promise->set_result(*result);
   promise->set_deferred_promise(isolate->heap()->undefined_value());
   promise->set_deferred_on_resolve(isolate->heap()->undefined_value());
   promise->set_deferred_on_reject(isolate->heap()->undefined_value());
   promise->set_fulfill_reactions(isolate->heap()->undefined_value());
   promise->set_reject_reactions(isolate->heap()->undefined_value());
 }
 
 void PromiseFulfill(Isolate* isolate, Handle<JSPromise> promise, int status,
                     Handle<Object> value) {
+  if (isolate->debug()->is_active()) {
+    isolate->debug()->OnAsyncTaskEvent(
+        debug::kDebugEnqueueRecurring,
+        isolate->debug()->NextAsyncTaskId(promise),
+        status == v8::Promise::kFulfilled ? kDebugPromiseResolve
+                                          : kDebugPromiseReject);
+  }
   // Check if there are any callbacks.
   if (!promise->deferred_promise()->IsUndefined(isolate)) {
     Handle<Object> tasks((status == v8::Promise::kFulfilled)
                              ? promise->fulfill_reactions()
                              : promise->reject_reactions(),
                          isolate);
     Handle<PromiseReactionJobInfo> info =
         isolate->factory()->NewPromiseReactionJobInfo(
             promise, value, tasks, handle(promise->deferred_promise(), isolate),
             handle(promise->deferred_on_resolve(), isolate),
             handle(promise->deferred_on_reject(), isolate),
             isolate->native_context());
-    EnqueuePromiseReactionJob(isolate, info, status);
+    EnqueuePromiseReactionJob(isolate, info, promise, status);
   }
 
   PromiseSet(isolate, promise, status, value);
 }
 
 }  // namespace
 
 RUNTIME_FUNCTION(Runtime_PromiseReject) {
   DCHECK_EQ(3, args.length());
   HandleScope scope(isolate);
   CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
   CONVERT_ARG_HANDLE_CHECKED(Object, reason, 1);
   CONVERT_BOOLEAN_ARG_CHECKED(debug_event, 2);
 
   PromiseRejectEvent(isolate, promise, promise, reason, debug_event);
   PromiseFulfill(isolate, promise, v8::Promise::kRejected, reason);
 
   return isolate->heap()->undefined_value();
 }
 
 RUNTIME_FUNCTION(Runtime_EnqueuePromiseReactionJob) {
   HandleScope scope(isolate);
-  DCHECK_EQ(2, args.length());
+  DCHECK_EQ(3, args.length());
   CONVERT_ARG_HANDLE_CHECKED(PromiseReactionJobInfo, info, 0);
-  CONVERT_SMI_ARG_CHECKED(status, 1);
-  EnqueuePromiseReactionJob(isolate, info, status);
+  CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 1);
+  CONVERT_SMI_ARG_CHECKED(status, 2);
+  EnqueuePromiseReactionJob(isolate, info, promise, status);
   return isolate->heap()->undefined_value();
 }
 
 RUNTIME_FUNCTION(Runtime_EnqueuePromiseResolveThenableJob) {
   HandleScope scope(isolate);
   DCHECK(args.length() == 1);
   CONVERT_ARG_HANDLE_CHECKED(PromiseResolveThenableJobInfo, info, 0);
   isolate->EnqueueMicrotask(info);
   return isolate->heap()->undefined_value();
 }
@@ skipping 77 matching lines @@
   HandleScope scope(isolate);
   DCHECK_EQ(1, args.length());
   CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
   isolate->RunPromiseHook(PromiseHookType::kAfter, promise,
                           isolate->factory()->undefined_value());
   return isolate->heap()->undefined_value();
 }
 
 }  // namespace internal
 }  // namespace v8