From 465a32a0874ac401fb6c30be4137b77e263a84ca Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Wed, 29 Nov 2017 11:02:49 +0900 Subject: [PATCH] Revert "deps: cherry-pick 3c8195d from V8 upstream" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e7f30db1a682208f2e5026ee299f07a3f23958e3. The original commit included tests for AsyncIterator that broke on 6.2 PR-URL: https://github.com/nodejs/node/pull/17383 Reviewed-By: Ben Noordhuis Reviewed-By: Colin Ihrig Reviewed-By: Michaël Zasso Reviewed-By: Refael Ackermann Reviewed-By: Yang Guo Reviewed-By: Michael Dawson --- common.gypi | 2 +- .../src/builtins/builtins-collections-gen.cc | 9 ++++---- .../caught-uncaught-exceptions-expected.txt | 8 ------- .../debugger/caught-uncaught-exceptions.js | 23 +------------------ 4 files changed, 6 insertions(+), 36 deletions(-) diff --git a/common.gypi b/common.gypi index 4b1f0377ba1745..1e6d9ac0b0fe0e 100644 --- a/common.gypi +++ b/common.gypi @@ -27,7 +27,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.12', + 'v8_embedder_string': '-node.13', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/src/builtins/builtins-collections-gen.cc b/deps/v8/src/builtins/builtins-collections-gen.cc index acb4c949ae11a8..3cb20cd8df11a5 100644 --- a/deps/v8/src/builtins/builtins-collections-gen.cc +++ b/deps/v8/src/builtins/builtins-collections-gen.cc @@ -302,11 +302,10 @@ TF_BUILTIN(MapConstructor, CollectionsBuiltinsAssembler) { BIND(&if_notobject); { - Node* ret = CallRuntime( - Runtime::kThrowTypeError, context, - SmiConstant(MessageTemplate::kIteratorValueNotAnObject), next_value); - GotoIfException(ret, &if_exception, &var_exception); - Unreachable(); + Node* const exception = MakeTypeError( + MessageTemplate::kIteratorValueNotAnObject, context, next_value); + var_exception.Bind(exception); + Goto(&if_exception); } } diff --git a/deps/v8/test/inspector/debugger/caught-uncaught-exceptions-expected.txt b/deps/v8/test/inspector/debugger/caught-uncaught-exceptions-expected.txt index 9c40b1c5561c94..b784fa549e3ba9 100644 --- a/deps/v8/test/inspector/debugger/caught-uncaught-exceptions-expected.txt +++ b/deps/v8/test/inspector/debugger/caught-uncaught-exceptions-expected.txt @@ -3,11 +3,3 @@ paused in throwCaught uncaught: false paused in throwUncaught 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 diff --git a/deps/v8/test/inspector/debugger/caught-uncaught-exceptions.js b/deps/v8/test/inspector/debugger/caught-uncaught-exceptions.js index b7c4bd4ab784ee..38b622d3dba0ff 100644 --- a/deps/v8/test/inspector/debugger/caught-uncaught-exceptions.js +++ b/deps/v8/test/inspector/debugger/caught-uncaught-exceptions.js @@ -7,19 +7,6 @@ let {session, contextGroup, Protocol} = InspectorTest.start("Check that inspecto contextGroup.addScript( `function throwCaught() { try { throw new Error(); } catch (_) {} } 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); } `); @@ -35,12 +22,4 @@ Protocol.Debugger.onPaused(message => { Protocol.Runtime.evaluate({ "expression": "schedule(throwCaught);" }) .then(() => Protocol.Runtime.evaluate( { "expression": "schedule(throwUncaught);" })) - .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()); + .then(() => InspectorTest.completeTest());