Revert "deps: cherry-pick 3c8195d from V8 upstream"

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 <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Yang Guo <yangguo@chromium.org>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

3 files changed, 5 insertions, 35 deletions

diff --git a/deps/v8/src/builtins/builtins-collections-gen.cc b/deps/v8/src/builtins/builtins-collections-gen.cc
index acb4c949ae..3cb20cd8df 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 9c40b1c556..b784fa549e 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 b7c4bd4ab7..38b622d3db 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());