Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(912)

Unified Diff: src/js/promise.js

Issue 2276243002: Mark await expressions as caught or uncaught (Closed)
Patch Set: Fix broken test Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/js/promise.js
diff --git a/src/js/promise.js b/src/js/promise.js
index c057238af696d78416a6198b3c0f68dabb8c31c1..8d653f23cd9fdf53f476d61a48b80af901fb8b29 100644
--- a/src/js/promise.js
+++ b/src/js/promise.js
@@ -12,6 +12,8 @@
// Imports
var InternalArray = utils.InternalArray;
+var promiseAwaitHandlerSymbol =
+ utils.ImportNow("promise_await_handler_symbol");
var promiseCombinedDeferredSymbol =
utils.ImportNow("promise_combined_deferred_symbol");
var promiseHasHandlerSymbol =
@@ -22,6 +24,8 @@ var promiseFulfillReactionsSymbol =
utils.ImportNow("promise_fulfill_reactions_symbol");
var promiseDeferredReactionsSymbol =
utils.ImportNow("promise_deferred_reactions_symbol");
+var promiseHandledHintSymbol =
+ utils.ImportNow("promise_handled_hint_symbol");
var promiseRawSymbol = utils.ImportNow("promise_raw_symbol");
var promiseStateSymbol = utils.ImportNow("promise_state_symbol");
var promiseResultSymbol = utils.ImportNow("promise_result_symbol");
@@ -381,16 +385,6 @@ function PromiseReject(r) {
}
}
-function PromiseCastResolved(value) {
- if (IsPromise(value)) {
- return value;
- } else {
- var promise = PromiseInit(new GlobalPromise(promiseRawSymbol));
- var resolveResult = ResolvePromise(promise, value);
- return promise;
- }
-}
-
function PerformPromiseThen(promise, onResolve, onReject, resultCapability) {
if (!IS_CALLABLE(onResolve)) onResolve = PromiseIdResolveHandler;
if (!IS_CALLABLE(onReject)) onReject = PromiseIdRejectHandler;
@@ -543,6 +537,7 @@ function PromiseRace(iterable) {
// Utility for debugger
function PromiseHasUserDefinedRejectHandlerCheck(handler, deferred) {
+ if (GET_PRIVATE(handler, promiseAwaitHandlerSymbol)) return false;
adamk 2016/09/09 18:46:28 I would appreciate a comment here.
Dan Ehrenberg 2016/09/10 01:54:14 Done
if (handler !== PromiseIdRejectHandler) {
var combinedDeferred = GET_PRIVATE(handler, promiseCombinedDeferredSymbol);
if (IS_UNDEFINED(combinedDeferred)) return true;
@@ -556,6 +551,8 @@ function PromiseHasUserDefinedRejectHandlerCheck(handler, deferred) {
}
function PromiseHasUserDefinedRejectHandlerRecursive(promise) {
+ var handledHintSymbol = GET_PRIVATE(promise, promiseHandledHintSymbol);
adamk 2016/09/09 18:46:29 Why store the return value of GET_PRIVATE?
Dan Ehrenberg 2016/09/10 01:54:14 Removed
+ if (handledHintSymbol) return true;
adamk 2016/09/09 18:46:28 A comment here too please.
Dan Ehrenberg 2016/09/10 01:54:14 Done
var queue = GET_PRIVATE(promise, promiseRejectReactionsSymbol);
var deferreds = GET_PRIVATE(promise, promiseDeferredReactionsSymbol);
if (IS_UNDEFINED(queue)) return false;
@@ -567,8 +564,8 @@ function PromiseHasUserDefinedRejectHandlerRecursive(promise) {
return true;
}
}
+ return false;
}
- return false;
}
// Return whether the promise will be handled by a user-defined reject
@@ -623,12 +620,14 @@ utils.InstallFunctions(extrasUtils, 0, [
]);
utils.Export(function(to) {
- to.PromiseCastResolved = PromiseCastResolved;
+ to.IsPromise = IsPromise;
+ to.PromiseCreate = PromiseCreate;
to.PromiseThen = PromiseThen;
to.GlobalPromise = GlobalPromise;
to.NewPromiseCapability = NewPromiseCapability;
to.PerformPromiseThen = PerformPromiseThen;
+ to.ResolvePromise = ResolvePromise;
to.RejectPromise = RejectPromise;
});
« src/js/harmony-async-await.js ('K') | « src/js/prologue.js ('k') | src/objects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698