Commit 465a32a
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 <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>1 parent 49d23a3 commit 465a32a
4 files changed
Lines changed: 6 additions & 36 deletions
File tree
- deps/v8
- src/builtins
- test/inspector/debugger
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -27,7 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | 28 | # Reset this number to 0 on major V8 upgrades. | |
| 29 | 29 | # Increment by one for each non-official patch applied to deps/v8. | |
| 30 | - 'v8_embedder_string': '-node.12', | ||
| 30 | + 'v8_embedder_string': '-node.13', | ||
| 31 | 31 | ||
| 32 | 32 | # Enable disassembler for `--print-code` v8 options | |
| 33 | 33 | 'v8_enable_disassembler': 1, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -302,11 +302,10 @@ TF_BUILTIN(MapConstructor, CollectionsBuiltinsAssembler) { | |||
| 302 | 302 | ||
| 303 | 303 | BIND(&if_notobject); | |
| 304 | 304 | { | |
| 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); | ||
| 310 | 309 | } | |
| 311 | 310 | } | |
| 312 | 311 | ||
Lines changed: 0 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,11 +3,3 @@ paused in throwCaught | |||
| 3 | 3 | uncaught: false | |
| 4 | 4 | paused in throwUncaught | |
| 5 | 5 | 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 | ||
Lines changed: 1 addition & 22 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,19 +7,6 @@ let {session, contextGroup, Protocol} = InspectorTest.start("Check that inspecto | |||
| 7 | 7 | contextGroup.addScript( | |
| 8 | 8 | `function throwCaught() { try { throw new Error(); } catch (_) {} } | |
| 9 | 9 | 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 | - } | ||
| 23 | 10 | function schedule(f) { setTimeout(f, 0); } | |
| 24 | 11 | `); | |
| 25 | 12 | ||
@@ -35,12 +22,4 @@ Protocol.Debugger.onPaused(message => { | |||
| 35 | 22 | Protocol.Runtime.evaluate({ "expression": "schedule(throwCaught);" }) | |
| 36 | 23 | .then(() => Protocol.Runtime.evaluate( | |
| 37 | 24 | { "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