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

Side by Side Diff: src/js/harmony-async-await.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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 the V8 project authors. All rights reserved. 1 // Copyright 2016 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 (function(global, utils, extrasUtils) { 5 (function(global, utils, extrasUtils) {
6 6
7 "use strict"; 7 "use strict";
8 8
9 %CheckIsBootstrapping(); 9 %CheckIsBootstrapping();
10 10
11 // ------------------------------------------------------------------- 11 // -------------------------------------------------------------------
12 // Imports 12 // Imports
13 13
14 var AsyncFunctionNext; 14 var AsyncFunctionNext;
15 var AsyncFunctionThrow; 15 var AsyncFunctionThrow;
16 var GlobalPromise; 16 var GlobalPromise;
17 var IsPromise;
17 var NewPromiseCapability; 18 var NewPromiseCapability;
18 var PerformPromiseThen; 19 var PerformPromiseThen;
19 var PromiseCastResolved; 20 var PromiseCreate;
20 var RejectPromise; 21 var RejectPromise;
22 var ResolvePromise;
21 23
22 utils.Import(function(from) { 24 utils.Import(function(from) {
23 AsyncFunctionNext = from.AsyncFunctionNext; 25 AsyncFunctionNext = from.AsyncFunctionNext;
24 AsyncFunctionThrow = from.AsyncFunctionThrow; 26 AsyncFunctionThrow = from.AsyncFunctionThrow;
27 IsPromise = from.IsPromise;
25 GlobalPromise = from.GlobalPromise; 28 GlobalPromise = from.GlobalPromise;
26 NewPromiseCapability = from.NewPromiseCapability; 29 NewPromiseCapability = from.NewPromiseCapability;
27 PromiseCastResolved = from.PromiseCastResolved; 30 PromiseCreate = from.PromiseCreate;
28 PerformPromiseThen = from.PerformPromiseThen; 31 PerformPromiseThen = from.PerformPromiseThen;
29 RejectPromise = from.RejectPromise; 32 RejectPromise = from.RejectPromise;
33 ResolvePromise = from.ResolvePromise;
30 }); 34 });
31 35
36 var promiseAwaitHandlerSymbol = utils.ImportNow("promise_await_handler_symbol");
37 var promiseHandledHintSymbol =
38 utils.ImportNow("promise_handled_hint_symbol");
39
32 // ------------------------------------------------------------------- 40 // -------------------------------------------------------------------
33 41
34 function AsyncFunctionAwait(generator, value) { 42 function PromiseCastResolved(value) {
35 // Promise.resolve(value).then( 43 if (IsPromise(value)) {
44 return value;
45 } else {
46 var promise = PromiseCreate();
47 ResolvePromise(promise, value);
48 return promise;
49 }
50 }
51
52 function AsyncFunctionAwait(generator, awaited, mark) {
adamk 2016/09/09 18:46:28 Comment please
Dan Ehrenberg 2016/09/10 01:54:14 Done
53 // Promise.resolve(awaited).then(
36 // value => AsyncFunctionNext(value), 54 // value => AsyncFunctionNext(value),
37 // error => AsyncFunctionThrow(error) 55 // error => AsyncFunctionThrow(error)
38 // ); 56 // );
39 var promise = PromiseCastResolved(value); 57 var promise = PromiseCastResolved(awaited);
40 58
41 var onFulfilled = 59 var onFulfilled =
42 (sentValue) => %_Call(AsyncFunctionNext, generator, sentValue); 60 (sentValue) => %_Call(AsyncFunctionNext, generator, sentValue);
43 var onRejected = 61 var onRejected =
44 (sentError) => %_Call(AsyncFunctionThrow, generator, sentError); 62 (sentError) => %_Call(AsyncFunctionThrow, generator, sentError);
45 63
46 // false debugEvent to avoid redundant ExceptionEvents 64 if (mark && DEBUG_IS_ACTIVE && IsPromise(awaited)) {
65 // Mark the reject handler callback such that it does not influence
66 // catch prediction.
67 SET_PRIVATE(onRejected, promiseAwaitHandlerSymbol, true);
68 }
69
70 // Just forwarding the exception, so no debugEvent for throwawayCapability
47 var throwawayCapability = NewPromiseCapability(GlobalPromise, false); 71 var throwawayCapability = NewPromiseCapability(GlobalPromise, false);
48 return PerformPromiseThen(promise, onFulfilled, onRejected, 72 return PerformPromiseThen(promise, onFulfilled, onRejected,
49 throwawayCapability); 73 throwawayCapability);
50 } 74 }
51 75
76 function AsyncFunctionAwaitUncaught(generator, awaited) {
adamk 2016/09/09 18:46:28 Comment please
Dan Ehrenberg 2016/09/10 01:54:14 Done
77 // TODO(littledan): Install a dependency edge from awaited to outerPromise
78 return AsyncFunctionAwait(generator, awaited, true);
79 }
80
81 function AsyncFunctionAwaitCaught(generator, awaited) {
adamk 2016/09/09 18:46:28 And here.
Dan Ehrenberg 2016/09/10 01:54:14 Done
82 if (DEBUG_IS_ACTIVE && IsPromise(awaited)) {
83 SET_PRIVATE(awaited, promiseHandledHintSymbol, true);
84 }
85 return AsyncFunctionAwait(generator, awaited, false);
86 }
87
52 // How the parser rejects promises from async/await desugaring 88 // How the parser rejects promises from async/await desugaring
53 function RejectPromiseNoDebugEvent(promise, reason) { 89 function RejectPromiseNoDebugEvent(promise, reason) {
54 return RejectPromise(promise, reason, false); 90 return RejectPromise(promise, reason, false);
55 } 91 }
56 92
57 %InstallToContext([ 93 %InstallToContext([
58 "async_function_await", AsyncFunctionAwait, 94 "async_function_await_caught", AsyncFunctionAwaitCaught,
95 "async_function_await_uncaught", AsyncFunctionAwaitUncaught,
59 "reject_promise_no_debug_event", RejectPromiseNoDebugEvent, 96 "reject_promise_no_debug_event", RejectPromiseNoDebugEvent,
60 ]); 97 ]);
61 98
62 }) 99 })
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698