From 9b3c115efbe75f45a9d2b0e17b85edd4256e69fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Mon, 17 Jun 2019 13:12:48 +0200 Subject: [PATCH] deps: V8: cherry-pick 3b8c624 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: GCC: explicitely instantiate JSObject::ApplyAttributesToDictionary for NumberDictionary elements.cc invokes ApplyAttributesToDictionary using NumberDictionary as its template parameter. But the declaration of the template method is in js-object.cc, so nobody can actually compile the version for number dictionary. This is fixed requesting explicit instantiation for NumberDictionary. This was breaking GCC build. Bug: chromium:819294 Change-Id: I685ddc5b97e129d1a534dbdb04025c0932bc5ecd Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1649565 Reviewed-by: Toon Verwaest Commit-Queue: José Dapena Paz Cr-Commit-Position: refs/heads/master@{#62097} Refs: https://github.com/v8/v8/commit/3b8c624bda58d05aea80dd9626cd550537d6ac3f Backport-PR-URL: https://github.com/nodejs/node/pull/28955 PR-URL: https://github.com/nodejs/node/pull/28016 Reviewed-By: Colin Ihrig Reviewed-By: Refael Ackermann (רפאל פלחי) Reviewed-By: Rich Trott Reviewed-By: Michael Dawson Reviewed-By: Jiawen Geng --- common.gypi | 2 +- deps/v8/AUTHORS | 1 + deps/v8/src/objects/js-objects.cc | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index c1445595209fc7..517a986acc4b7f 100644 --- a/common.gypi +++ b/common.gypi @@ -38,7 +38,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/AUTHORS b/deps/v8/AUTHORS index 1c8424243d5e9e..5a8628b4cb2a77 100644 --- a/deps/v8/AUTHORS +++ b/deps/v8/AUTHORS @@ -15,6 +15,7 @@ NVIDIA Corporation <*@nvidia.com> BlackBerry Limited <*@blackberry.com> Opera Software ASA <*@opera.com> Intel Corporation <*@intel.com> +LG Electronics, Inc. <*@lge.com> Microsoft <*@microsoft.com> MIPS Technologies, Inc. <*@mips.com> Imagination Technologies, LLC <*@imgtec.com> diff --git a/deps/v8/src/objects/js-objects.cc b/deps/v8/src/objects/js-objects.cc index e76563cdc0962a..7fb11b1d97fa33 100644 --- a/deps/v8/src/objects/js-objects.cc +++ b/deps/v8/src/objects/js-objects.cc @@ -3752,6 +3752,10 @@ void JSObject::ApplyAttributesToDictionary( } } +template void JSObject::ApplyAttributesToDictionary( + Isolate* isolate, ReadOnlyRoots roots, Handle dictionary, + const PropertyAttributes attributes); + template Maybe JSObject::PreventExtensionsWithTransition( Handle object, ShouldThrow should_throw) {