From 2c6cf902b01df73cad300698e75302c29be5a8af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Mon, 4 Nov 2019 12:57:15 +0100 Subject: [PATCH] deps: V8: cherry-pick 50031fae736f 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 Reviewed-by: Jakob Gruber Cr-Commit-Position: refs/heads/master@{#64719} Refs: https://github.com/v8/v8/commit/50031fae736fac7b2b309369df492bfd0edd7553 Backport-PR-URL: https://github.com/nodejs/node/pull/30513 PR-URL: https://github.com/nodejs/node/pull/30020 Reviewed-By: Colin Ihrig Reviewed-By: Jiawen Geng Reviewed-By: Anna Henningsen Reviewed-By: Matteo Collina --- common.gypi | 2 +- .../src/compiler/serializer-for-background-compilation.cc | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common.gypi b/common.gypi index 211b418f98a38b..b5df26fd2be34f 100644 --- a/common.gypi +++ b/common.gypi @@ -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 ##### diff --git a/deps/v8/src/compiler/serializer-for-background-compilation.cc b/deps/v8/src/compiler/serializer-for-background-compilation.cc index 0391e8742d64cd..ebf3dbd482e7fe 100644 --- a/deps/v8/src/compiler/serializer-for-background-compilation.cc +++ b/deps/v8/src/compiler/serializer-for-background-compilation.cc @@ -387,8 +387,10 @@ class CompilationSubject { // always has a FunctionBlueprint. class Callee { public: - explicit Callee(Handle jsfunction) : jsfunction_(jsfunction) {} - explicit Callee(FunctionBlueprint const& blueprint) : blueprint_(blueprint) {} + explicit Callee(Handle jsfunction) + : jsfunction_(jsfunction), blueprint_() {} + explicit Callee(FunctionBlueprint const& blueprint) + : jsfunction_(), blueprint_(blueprint) {} Handle shared(Isolate* isolate) const { return blueprint_.has_value()