Commit 3c8195d9 authored by Yang Guo's avatar Yang Guo Committed by Commit Bot

[map] Fix map constructor to correctly throw.

We need to throw before rethrowing, otherwise the exception does
not trigger a debugger event and is not reported if uncaught.

R=gsathya@chromium.org, jgruber@chromium.org

Bug: v8:7047
Change-Id: I7ce0253883a21d6059e4e0ed0fc56dc55a0dcba6
Reviewed-on: https://chromium-review.googlesource.com/758372Reviewed-by: 's avatarJakob Gruber <jgruber@chromium.org>
Reviewed-by: 's avatarSathya Gunasekaran <gsathya@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49237}
parent 295c9cc6
...@@ -316,10 +316,11 @@ TF_BUILTIN(MapConstructor, CollectionsBuiltinsAssembler) { ...@@ -316,10 +316,11 @@ TF_BUILTIN(MapConstructor, CollectionsBuiltinsAssembler) {
BIND(&if_notobject); BIND(&if_notobject);
{ {
Node* const exception = MakeTypeError( Node* ret = CallRuntime(
MessageTemplate::kIteratorValueNotAnObject, context, next_value); Runtime::kThrowTypeError, context,
var_exception.Bind(exception); SmiConstant(MessageTemplate::kIteratorValueNotAnObject), next_value);
Goto(&if_exception); GotoIfException(ret, &if_exception, &var_exception);
Unreachable();
} }
} }
......
...@@ -3,3 +3,11 @@ paused in throwCaught ...@@ -3,3 +3,11 @@ paused in throwCaught
uncaught: false uncaught: false
paused in throwUncaught paused in throwUncaught
uncaught: true uncaught: true
paused in throwInPromiseCaught
uncaught: false
paused in promiseUncaught
uncaught: true
paused in throwInMapConstructor
uncaught: true
paused in throwInAsyncIterator
uncaught: true
\ No newline at end of file
...@@ -7,6 +7,19 @@ let {session, contextGroup, Protocol} = InspectorTest.start("Check that inspecto ...@@ -7,6 +7,19 @@ let {session, contextGroup, Protocol} = InspectorTest.start("Check that inspecto
contextGroup.addScript( contextGroup.addScript(
`function throwCaught() { try { throw new Error(); } catch (_) {} } `function throwCaught() { try { throw new Error(); } catch (_) {} }
function throwUncaught() { throw new Error(); } function throwUncaught() { throw new Error(); }
function throwInPromiseCaught() {
var reject;
new Promise(function(res, rej) { reject = rej; }).catch(() => {});
reject();
}
function throwInPromiseUncaught() {
new Promise(function promiseUncaught() { throw new Error(); });
}
function throwInMapConstructor() { new Map('a'); }
function throwInAsyncIterator() {
let it = (async function*() {})();
it.next.call({});
}
function schedule(f) { setTimeout(f, 0); } function schedule(f) { setTimeout(f, 0); }
`); `);
...@@ -22,4 +35,12 @@ Protocol.Debugger.onPaused(message => { ...@@ -22,4 +35,12 @@ Protocol.Debugger.onPaused(message => {
Protocol.Runtime.evaluate({ "expression": "schedule(throwCaught);" }) Protocol.Runtime.evaluate({ "expression": "schedule(throwCaught);" })
.then(() => Protocol.Runtime.evaluate( .then(() => Protocol.Runtime.evaluate(
{ "expression": "schedule(throwUncaught);" })) { "expression": "schedule(throwUncaught);" }))
.then(() => InspectorTest.completeTest()); .then(() => Protocol.Runtime.evaluate(
{ "expression": "schedule(throwInPromiseCaught);"}))
.then(() => Protocol.Runtime.evaluate(
{ "expression": "schedule(throwInPromiseUncaught);"}))
.then(() => Protocol.Runtime.evaluate(
{ "expression": "schedule(throwInMapConstructor);"}))
.then(() => Protocol.Runtime.evaluate(
{ "expression": "schedule(throwInAsyncIterator);"}))
.then(() => InspectorTest.completeTest());
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment