Skip to content

Commit

Permalink
deps: V8: cherry-pick 50031fae736f
Browse files Browse the repository at this point in the history
Original commit message:

    [compiler] Explicitly initialize const members

    This fixes a compilation error in Node.js with Xcode:

    initialize the const member 'blueprint_'.

    error: constructor for 'v8::internal::compiler::Callee' must explicitly
    Change-Id: Ia55398428d0de35a9ad5132eabd22d0adb694514
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1895561
    Commit-Queue: Jakob Gruber <[email protected]>
    Reviewed-by: Jakob Gruber <[email protected]>
    Cr-Commit-Position: refs/heads/master@{#64719}

Refs: v8/v8@50031fa

Backport-PR-URL: #30513
PR-URL: #30020
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Jiawen Geng <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
  • Loading branch information
targos authored and MylesBorins committed Nov 21, 2019
1 parent 1e5e8c3 commit 2c6cf90
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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.18',
'v8_embedder_string': '-node.19',

##### V8 defaults for Node.js #####

Expand Down
6 changes: 4 additions & 2 deletions deps/v8/src/compiler/serializer-for-background-compilation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,10 @@ class CompilationSubject {
// always has a FunctionBlueprint.
class Callee {
public:
explicit Callee(Handle<JSFunction> jsfunction) : jsfunction_(jsfunction) {}
explicit Callee(FunctionBlueprint const& blueprint) : blueprint_(blueprint) {}
explicit Callee(Handle<JSFunction> jsfunction)
: jsfunction_(jsfunction), blueprint_() {}
explicit Callee(FunctionBlueprint const& blueprint)
: jsfunction_(), blueprint_(blueprint) {}

Handle<SharedFunctionInfo> shared(Isolate* isolate) const {
return blueprint_.has_value()
Expand Down

0 comments on commit 2c6cf90

Please sign in to comment.