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

Unified Diff: src/js/promise.js

Issue 2028253004: Promises: Short circuit promise resolution procedure (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: fix tests Created 4 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/js/promise.js
diff --git a/src/js/promise.js b/src/js/promise.js
index f5b39b4048dd5da161a31ccedc7838abdbe65225..930a6143ac6734299d3a385b4e770f200ca9d8ab 100644
--- a/src/js/promise.js
+++ b/src/js/promise.js
@@ -250,6 +250,33 @@ function ResolvePromise(promise, resolution) {
} catch (e) {
return RejectPromise(promise, e);
}
+
+ // Resolution is a native promise and if it's already resolved or
+ // rejected, shortcircuit the resolution procedure by directly
+ // reusing the value from the promise.
+ if (IsPromise(resolution) && then === PromiseThen) {
+ var thenableState = GET_PRIVATE(resolution, promiseStateSymbol);
+ if (thenableState === kFulfilled) {
+ // This goes inside the if-else to save one symbol lookup in
+ // the slow path.
+ var thenableValue = GET_PRIVATE(resolution, promiseResultSymbol);
+ FulfillPromise(promise, kFulfilled, thenableValue,
+ promiseFulfillReactionsSymbol);
+ SET_PRIVATE(promise, promiseHasHandlerSymbol, true);
+ return;
+ } else if (thenableState === kRejected) {
+ var thenableValue = GET_PRIVATE(resolution, promiseResultSymbol);
+ if (!HAS_DEFINED_PRIVATE(resolution, promiseHasHandlerSymbol)) {
+ // Promise has already been rejected, but had no handler.
+ // Revoke previously triggered reject event.
+ %PromiseRevokeReject(resolution);
+ }
+ RejectPromise(promise, thenableValue);
+ SET_PRIVATE(resolution, promiseHasHandlerSymbol, true);
+ return;
+ }
+ }
+
if (IS_CALLABLE(then)) {
// PromiseResolveThenableJob
var id, name, instrumenting = DEBUG_IS_ACTIVE;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698