Skip to content

Commit

Permalink
deps: V8: cherry-pick 3b8c624
Browse files Browse the repository at this point in the history
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 <verwaest@chromium.org>
    Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
    Cr-Commit-Position: refs/heads/master@{#62097}

Refs: v8/v8@3b8c624

Backport-PR-URL: #28955
PR-URL: #28016
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann (רפאל פלחי) <refack@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
  • Loading branch information
targos committed Aug 16, 2019
1 parent 533b2d4 commit 9b3c115
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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 #####

Expand Down
1 change: 1 addition & 0 deletions deps/v8/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions deps/v8/src/objects/js-objects.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3752,6 +3752,10 @@ void JSObject::ApplyAttributesToDictionary(
}
}

template void JSObject::ApplyAttributesToDictionary(
Isolate* isolate, ReadOnlyRoots roots, Handle<NumberDictionary> dictionary,
const PropertyAttributes attributes);

template <PropertyAttributes attrs>
Maybe<bool> JSObject::PreventExtensionsWithTransition(
Handle<JSObject> object, ShouldThrow should_throw) {
Expand Down

0 comments on commit 9b3c115

Please sign in to comment.