Skip to content

Commit 53cc6c8

Browse files
targosBethGriggs
authored andcommitted
deps: V8: cherry-pick 3d24b3ab8af0
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 <[email protected]> Commit-Queue: José Dapena Paz <[email protected]> Cr-Commit-Position: refs/heads/master@{#74889} Refs: v8/v8@3d24b3a Backport-PR-URL: #39470 PR-URL: #38990 Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent 4709da0 commit 53cc6c8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.7',
39+
'v8_embedder_string': '-node.8',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/src/codegen/arm64/register-arm64.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ class VRegister : public CPURegister {
413413
static constexpr int kMaxNumRegisters = kNumberOfVRegisters;
414414
STATIC_ASSERT(kMaxNumRegisters == kDoubleAfterLast);
415415

416-
static VRegister from_code(int code) {
416+
static constexpr VRegister from_code(int code) {
417417
// Always return a D register.
418418
return VRegister::Create(code, kDRegSizeInBits);
419419
}

0 commit comments

Comments
 (0)