Skip to content

Commit 465a32a

Browse files
committed
Revert "deps: cherry-pick 3c8195d from V8 upstream"
This reverts commit e7f30db. The original commit included tests for AsyncIterator that broke on 6.2 PR-URL: #17383 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Yang Guo <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
1 parent 49d23a3 commit 465a32a

File tree

4 files changed

+6
-36
lines changed

4 files changed

+6
-36
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
# Reset this number to 0 on major V8 upgrades.
2929
# Increment by one for each non-official patch applied to deps/v8.
30-
'v8_embedder_string': '-node.12',
30+
'v8_embedder_string': '-node.13',
3131

3232
# Enable disassembler for `--print-code` v8 options
3333
'v8_enable_disassembler': 1,

deps/v8/src/builtins/builtins-collections-gen.cc

+4-5
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,10 @@ TF_BUILTIN(MapConstructor, CollectionsBuiltinsAssembler) {
302302

303303
BIND(&if_notobject);
304304
{
305-
Node* ret = CallRuntime(
306-
Runtime::kThrowTypeError, context,
307-
SmiConstant(MessageTemplate::kIteratorValueNotAnObject), next_value);
308-
GotoIfException(ret, &if_exception, &var_exception);
309-
Unreachable();
305+
Node* const exception = MakeTypeError(
306+
MessageTemplate::kIteratorValueNotAnObject, context, next_value);
307+
var_exception.Bind(exception);
308+
Goto(&if_exception);
310309
}
311310
}
312311

deps/v8/test/inspector/debugger/caught-uncaught-exceptions-expected.txt

-8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,3 @@ paused in throwCaught
33
uncaught: false
44
paused in throwUncaught
55
uncaught: true
6-
paused in throwInPromiseCaught
7-
uncaught: false
8-
paused in promiseUncaught
9-
uncaught: true
10-
paused in throwInMapConstructor
11-
uncaught: true
12-
paused in throwInAsyncIterator
13-
uncaught: true

deps/v8/test/inspector/debugger/caught-uncaught-exceptions.js

+1-22
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,6 @@ let {session, contextGroup, Protocol} = InspectorTest.start("Check that inspecto
77
contextGroup.addScript(
88
`function throwCaught() { try { throw new Error(); } catch (_) {} }
99
function throwUncaught() { throw new Error(); }
10-
function throwInPromiseCaught() {
11-
var reject;
12-
new Promise(function(res, rej) { reject = rej; }).catch(() => {});
13-
reject();
14-
}
15-
function throwInPromiseUncaught() {
16-
new Promise(function promiseUncaught() { throw new Error(); });
17-
}
18-
function throwInMapConstructor() { new Map('a'); }
19-
function throwInAsyncIterator() {
20-
let it = (async function*() {})();
21-
it.next.call({});
22-
}
2310
function schedule(f) { setTimeout(f, 0); }
2411
`);
2512

@@ -35,12 +22,4 @@ Protocol.Debugger.onPaused(message => {
3522
Protocol.Runtime.evaluate({ "expression": "schedule(throwCaught);" })
3623
.then(() => Protocol.Runtime.evaluate(
3724
{ "expression": "schedule(throwUncaught);" }))
38-
.then(() => Protocol.Runtime.evaluate(
39-
{ "expression": "schedule(throwInPromiseCaught);"}))
40-
.then(() => Protocol.Runtime.evaluate(
41-
{ "expression": "schedule(throwInPromiseUncaught);"}))
42-
.then(() => Protocol.Runtime.evaluate(
43-
{ "expression": "schedule(throwInMapConstructor);"}))
44-
.then(() => Protocol.Runtime.evaluate(
45-
{ "expression": "schedule(throwInAsyncIterator);"}))
46-
.then(() => InspectorTest.completeTest());
25+
.then(() => InspectorTest.completeTest());

0 commit comments

Comments
 (0)