From 53cc6c800099255fe672599f4071be5ad8d1c8e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Thu, 10 Jun 2021 14:20:43 +0200 Subject: [PATCH] deps: V8: cherry-pick 3d24b3ab8af0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: ARM64: VRegister::from_code expected to be constexpr GCC build fails trying to use a non constexpr function from a constexpr function. ../chromium-92.0.4503.0/v8/src/wasm/baseline/liftoff-register.h: In member function 'constexpr v8::internal::DoubleRegister v8::internal::wasm::LiftoffRegister::fp() const': ../chromium-92.0.4503.0/v8/src/wasm/baseline/liftoff-register.h:286:71: error: call to non-'constexpr' function 'static v8::internal::VRegister v8::internal::VRegister::from_code(int)' 286 | return DoubleRegister::from_code(code_ - kAfterMaxLiftoffGpRegCode); | ^ In file included from ../chromium-92.0.4503.0/v8/src/codegen/register-arch.h:16, from ../chromium-92.0.4503.0/v8/src/deoptimizer/translation-array.h:8, from ../chromium-92.0.4503.0/v8/src/objects/code.h:10, from ../chromium-92.0.4503.0/v8/src/codegen/reloc-info.h:10, from ../chromium-92.0.4503.0/v8/src/codegen/assembler.h:47, from ../chromium-92.0.4503.0/v8/src/codegen/assembler-arch.h:8, from ../chromium-92.0.4503.0/v8/src/codegen/turbo-assembler.h:12, from ../chromium-92.0.4503.0/v8/src/codegen/macro-assembler.h:8, from ../chromium-92.0.4503.0/v8/src/wasm/baseline/liftoff-assembler.h:13, from ../chromium-92.0.4503.0/v8/src/wasm/baseline/liftoff-assembler.cc:5: ../chromium-92.0.4503.0/v8/src/codegen/arm64/register-arm64.h:416:20: note: 'static v8::internal::VRegister v8::internal::VRegister::from_code(int)' declared here 416 | static VRegister from_code(int code) { | ^~~~~~~~~ Bug: chromium:819294 Change-Id: Ia19ea90f3f666702d32c90e147af17dcda7e08a6 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2929805 Reviewed-by: Maya Lekova Commit-Queue: José Dapena Paz Cr-Commit-Position: refs/heads/master@{#74889} Refs: https://github.com/v8/v8/commit/3d24b3ab8af0e822081f1b446a2439f13a086843 Backport-PR-URL: https://github.com/nodejs/node/pull/39470 PR-URL: https://github.com/nodejs/node/pull/38990 Reviewed-By: Jiawen Geng Reviewed-By: Matteo Collina Reviewed-By: Robert Nagy Reviewed-By: Colin Ihrig --- common.gypi | 2 +- deps/v8/src/codegen/arm64/register-arm64.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index 1f74cb02d7653c..88f37a7bec4cfc 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.7', + 'v8_embedder_string': '-node.8', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/codegen/arm64/register-arm64.h b/deps/v8/src/codegen/arm64/register-arm64.h index 19c574f7f694c0..5b234526a4361a 100644 --- a/deps/v8/src/codegen/arm64/register-arm64.h +++ b/deps/v8/src/codegen/arm64/register-arm64.h @@ -413,7 +413,7 @@ class VRegister : public CPURegister { static constexpr int kMaxNumRegisters = kNumberOfVRegisters; STATIC_ASSERT(kMaxNumRegisters == kDoubleAfterLast); - static VRegister from_code(int code) { + static constexpr VRegister from_code(int code) { // Always return a D register. return VRegister::Create(code, kDRegSizeInBits); }