Skip to content

Commit 9452dc3

Browse files
committed
deps: V8: cherry-pick de611e69ad51
This allows Maglev (see ref) to build on the compilers we use. Original commit message: [maglev] fix non-ptr-compr compilation on old compilers When pointer compression is disabled, the preprocessor expands some static asserts to static_assert(false), which doesn't compile on compilers not implementing the C++ defect report CWG2518, notably clang before version 17 and gcc before version 13. Adding in part of the template parameter to the static assert prevents it from being evaluated immediately which fixes the compilation. Test: compiled with gcc-11 and clang-14 without pointer compression. Change-Id: I95ce29bdb1278e6dad9e592d6f9476395f8aeb59 Fixed: v8:14355 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5022760 Reviewed-by: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Leszek Swirski <leszeks@chromium.org> Cr-Commit-Position: refs/heads/main@{#91553} Refs: v8/v8@de611e6 Refs: #50690
1 parent 71e19e8 commit 9452dc3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
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.18',
39+
'v8_embedder_string': '-node.19',
4040

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

deps/v8/src/maglev/maglev-code-generator.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ class ParallelMoveResolver {
419419
void EmitMovesFromSource(RegisterT source_reg, GapMoveTargets&& targets) {
420420
DCHECK(moves_from_register_[source_reg.code()].is_empty());
421421
if constexpr (DecompressIfNeeded) {
422-
static_assert(COMPRESS_POINTERS_BOOL);
422+
// static_assert(COMPRESS_POINTERS_BOOL);
423423
if (targets.needs_decompression == kNeedsDecompression) {
424424
__ DecompressTagged(source_reg, source_reg);
425425
}
@@ -462,7 +462,7 @@ class ParallelMoveResolver {
462462
// Decompress after the first move, subsequent moves reuse this register so
463463
// they're guaranteed to be decompressed.
464464
if constexpr (DecompressIfNeeded) {
465-
static_assert(COMPRESS_POINTERS_BOOL);
465+
// static_assert(COMPRESS_POINTERS_BOOL);
466466
if (targets.needs_decompression == kNeedsDecompression) {
467467
__ DecompressTagged(register_with_slot_value, register_with_slot_value);
468468
targets.needs_decompression = kDoesNotNeedDecompression;

0 commit comments

Comments
 (0)