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]>
nodejs · Dec 12, 2017 · e92b33e · e92b33e
1 parent e2a5633
commit e92b33e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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());