Async/await Promise dependency graph

src/js/harmony-async-await.js

Index: src/js/harmony-async-await.js
diff --git a/src/js/harmony-async-await.js b/src/js/harmony-async-await.js
index 4109b77fb54174366cdae648b0dae7fc0c5b02af..0d470bbe8c84300dfcd9213ba1becb016294bd40 100644
--- a/src/js/harmony-async-await.js
+++ b/src/js/harmony-async-await.js
@@ -36,6 +36,8 @@ utils.Import(function(from) {
 var promiseAwaitHandlerSymbol = utils.ImportNow("promise_await_handler_symbol");
 var promiseHandledHintSymbol =
     utils.ImportNow("promise_handled_hint_symbol");
+var promiseHasHandlerSymbol =
+    utils.ImportNow("promise_has_handler_symbol");
 
 // -------------------------------------------------------------------
 
@@ -54,10 +56,11 @@ function PromiseCastResolved(value) {
 // Shared logic for the core of await. The parser desugars
 //   await awaited
 // into
-//   yield AsyncFunctionAwait{Caught,Uncaught}(.generator, awaited)
+//   yield AsyncFunctionAwait{Caught,Uncaught}(.generator, awaited, .promise)
 // The 'awaited' parameter is the value; the generator stands in
-// for the asyncContext, and mark is metadata for debugging
-function AsyncFunctionAwait(generator, awaited, mark) {
+// for the asyncContext, and .promise is the larger promise under
+// construction by the enclosing async function.
+function AsyncFunctionAwait(generator, awaited, outerPromise) {
   // Promise.resolve(awaited).then(
   //     value => AsyncFunctionNext(value),
   //     error => AsyncFunctionThrow(error)
@@ -69,32 +72,42 @@ function AsyncFunctionAwait(generator, awaited, mark) {
   var onRejected =
       (sentError) => %_Call(AsyncFunctionThrow, generator, sentError);
 
-  if (mark && DEBUG_IS_ACTIVE && IsPromise(awaited)) {
-    // Mark the reject handler callback such that it does not influence
-    // catch prediction.
-    SET_PRIVATE(onRejected, promiseAwaitHandlerSymbol, true);
-  }
-
   // Just forwarding the exception, so no debugEvent for throwawayCapability
   var throwawayCapability = NewPromiseCapability(GlobalPromise, false);
-  return PerformPromiseThen(promise, onFulfilled, onRejected,
-                            throwawayCapability);
+  // The Promise will be thrown away and not handled, but it shouldn't trigger
+  // unhandled reject events as its work is done
+  SET_PRIVATE(throwawayCapability.promise, promiseHasHandlerSymbol, true);
+  PerformPromiseThen(promise, onFulfilled, onRejected, throwawayCapability);
+
+  if (DEBUG_IS_ACTIVE && !IS_UNDEFINED(outerPromise)) {
+    if (IsPromise(awaited)) {
+      // Mark the reject handler callback to continue recursing to outerPromise
+      SET_PRIVATE(onRejected, promiseAwaitHandlerSymbol, outerPromise);

[adamk, 2016/09/15 22:39:40]

Most other places that use promiseAwaitHandlerSymbol are set on Promise
instances, but this sets it on a function. Is this case mentioned in your CL
description?

[Dan Ehrenberg, 2016/09/17 00:04:31]

It's the first bullet.

+    }
+
+    // Mark the dependency to outerPromise in case the throwaway Promise is
+    // found on the Promise stack
+    SET_PRIVATE(throwawayCapability.promise, promiseAwaitHandlerSymbol,
+                outerPromise);
+  }
 }
 
 // Called by the parser from the desugaring of 'await' when catch
 // prediction indicates no locally surrounding catch block
-function AsyncFunctionAwaitUncaught(generator, awaited) {
-  // TODO(littledan): Install a dependency edge from awaited to outerPromise
-  return AsyncFunctionAwait(generator, awaited, true);
+function AsyncFunctionAwaitUncaught(generator, awaited, outerPromise) {
+  AsyncFunctionAwait(generator, awaited, outerPromise);
 }
 
 // Called by the parser from the desugaring of 'await' when catch
 // prediction indicates that there is a locally surrounding catch block
-function AsyncFunctionAwaitCaught(generator, awaited) {
+function AsyncFunctionAwaitCaught(generator, awaited, outerPromise) {
   if (DEBUG_IS_ACTIVE && IsPromise(awaited)) {
     SET_PRIVATE(awaited, promiseHandledHintSymbol, true);
   }
-  return AsyncFunctionAwait(generator, awaited, false);
+  // Pass undefined for the outer Promise to not waste time setting up
+  // or following the dependency chain when this Promise is already marked
+  // as handled
+  AsyncFunctionAwait(generator, awaited, UNDEFINED);
 }
 
 // How the parser rejects promises from async/await desugaring