From 9ad0e2caccbb339070bbd292191ea1d5b56a8043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 26 Sep 2023 10:33:39 +0200 Subject: [PATCH] deps: V8: cherry-pick 89b3702c92b0 Original commit message: Reland^2 "[iterator-helpers] Unship due to incompat" This is a reland of commit bab67985346dbc0d566391ad561537b4554455b4 Change since reland: A second breakage reported in chromium:1480783 Original change's description: > Reland "[iterator-helpers] Unship due to incompat" > > This is a reland of commit 1a22cf9896d682a9dfca589f92ed97c7f875b8a2 > > Change since revert: I mistakenly thought part of the finch > kill-switch playbook is to keep it enabled on ToT. It's actually > the opposite. > > Original change's description: > > [iterator-helpers] Unship due to incompat > > > > Bug: chromium:1474613, v8:13558 > > Change-Id: Iccba26e5cd5dc1787172c78b6e4f6889ef67fcea > > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4834350 > > Reviewed-by: Adam Klein > > Commit-Queue: Shu-yu Guo > > Cr-Commit-Position: refs/heads/main@{#89741} > > Bug: chromium:1474613, v8:13558 > Change-Id: Idc421a114303f036622bff681c9fa252c9110b9d > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4843761 > Commit-Queue: Rezvan Mahdavi Hezaveh > Auto-Submit: Shu-yu Guo > Commit-Queue: Shu-yu Guo > Reviewed-by: Rezvan Mahdavi Hezaveh > Cr-Commit-Position: refs/heads/main@{#89800} Bug: chromium:1474613, v8:13558 Change-Id: Ia933c874508f1ec10ea4718c6378858cd5bec8f9 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4854732 Reviewed-by: Rezvan Mahdavi Hezaveh Auto-Submit: Shu-yu Guo Commit-Queue: Rezvan Mahdavi Hezaveh Cr-Commit-Position: refs/heads/main@{#89905} Refs: https://github.com/v8/v8/commit/89b3702c92b0dfe8737eda94cedb1ec715b30fc7 PR-URL: https://github.com/nodejs/node/pull/49639 Reviewed-By: Jiawen Geng Reviewed-By: Rafael Gonzaga Reviewed-By: Antoine du Hamel --- common.gypi | 2 +- deps/v8/src/flags/flag-definitions.h | 6 +++--- deps/v8/test/mjsunit/es6/iterator-prototype.js | 2 ++ deps/v8/test/mozilla/mozilla.status | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/common.gypi b/common.gypi index 7796ec5763f437..9c603e8963211a 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,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.10', + 'v8_embedder_string': '-node.11', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/flags/flag-definitions.h b/deps/v8/src/flags/flag-definitions.h index e169e5707d1e3a..6acb97299e0026 100644 --- a/deps/v8/src/flags/flag-definitions.h +++ b/deps/v8/src/flags/flag-definitions.h @@ -278,7 +278,8 @@ DEFINE_BOOL(js_shipping, true, "enable all shipped JavaScript features") // Features that are complete (but still behind the --harmony flag). #define HARMONY_STAGED_BASE(V) \ - V(harmony_set_methods, "harmony Set Methods") + V(harmony_set_methods, "harmony Set Methods") \ + V(harmony_iterator_helpers, "JavaScript iterator helpers") #define JAVASCRIPT_STAGED_FEATURES_BASE(V) \ V(js_promise_withresolvers, "Promise.withResolvers") @@ -303,8 +304,7 @@ DEFINE_WEAK_IMPLICATION(harmony_rab_gsab_transfer, harmony_rab_gsab) V(harmony_regexp_unicode_sets, "harmony RegExp Unicode Sets") \ V(harmony_json_parse_with_source, "harmony json parse with source") \ V(harmony_rab_gsab_transfer, "harmony ArrayBuffer.transfer") \ - V(harmony_array_grouping, "harmony array grouping") \ - V(harmony_iterator_helpers, "JavaScript iterator helpers") + V(harmony_array_grouping, "harmony array grouping") #define JAVASCRIPT_SHIPPING_FEATURES_BASE(V) diff --git a/deps/v8/test/mjsunit/es6/iterator-prototype.js b/deps/v8/test/mjsunit/es6/iterator-prototype.js index 82277d98170250..496b67de122aa6 100644 --- a/deps/v8/test/mjsunit/es6/iterator-prototype.js +++ b/deps/v8/test/mjsunit/es6/iterator-prototype.js @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// Flags: --harmony-iterator-helpers + var arrayIteratorPrototype = [].entries().__proto__; var iteratorPrototype = arrayIteratorPrototype.__proto__; diff --git a/deps/v8/test/mozilla/mozilla.status b/deps/v8/test/mozilla/mozilla.status index 724252d34e0c0b..aacb4e22335237 100644 --- a/deps/v8/test/mozilla/mozilla.status +++ b/deps/v8/test/mozilla/mozilla.status @@ -546,6 +546,7 @@ # Uses Mozilla-specific QName, XML, XMLList and Iterator. 'js1_5/Regress/regress-407323': [FAIL_OK], + 'js1_5/Regress/regress-407957': [FAIL_OK], # Relies on JavaScript 1.2 / 1.3 deprecated features.