Commit 0da3bee
deps: V8: cherry-pick de611e69ad51
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
PR-URL: #51200
Refs: #50690
Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
PR-URL: #50115
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>1 parent b982335 commit 0da3bee
2 files changed
Lines changed: 11 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | 37 | # Reset this number to 0 on major V8 upgrades. | |
| 38 | 38 | # Increment by one for each non-official patch applied to deps/v8. | |
| 39 | - 'v8_embedder_string': '-node.11', | ||
| 39 | + 'v8_embedder_string': '-node.12', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -419,7 +419,11 @@ class ParallelMoveResolver { | |||
| 419 | 419 | void EmitMovesFromSource(RegisterT source_reg, GapMoveTargets&& targets) { | |
| 420 | 420 | DCHECK(moves_from_register_[source_reg.code()].is_empty()); | |
| 421 | 421 | if constexpr (DecompressIfNeeded) { | |
| 422 | - static_assert(COMPRESS_POINTERS_BOOL); | ||
| 422 | + // The DecompressIfNeeded clause is redundant with the if-constexpr above, | ||
| 423 | + // but otherwise this code cannot be compiled by compilers not yet | ||
| 424 | + // implementing CWG2518. | ||
| 425 | + static_assert(DecompressIfNeeded && COMPRESS_POINTERS_BOOL); | ||
| 426 | + | ||
| 423 | 427 | if (targets.needs_decompression == kNeedsDecompression) { | |
| 424 | 428 | __ DecompressTagged(source_reg, source_reg); | |
| 425 | 429 | } | |
@@ -462,7 +466,11 @@ class ParallelMoveResolver { | |||
| 462 | 466 | // Decompress after the first move, subsequent moves reuse this register so | |
| 463 | 467 | // they're guaranteed to be decompressed. | |
| 464 | 468 | if constexpr (DecompressIfNeeded) { | |
| 465 | - static_assert(COMPRESS_POINTERS_BOOL); | ||
| 469 | + // The DecompressIfNeeded clause is redundant with the if-constexpr above, | ||
| 470 | + // but otherwise this code cannot be compiled by compilers not yet | ||
| 471 | + // implementing CWG2518. | ||
| 472 | + static_assert(DecompressIfNeeded && COMPRESS_POINTERS_BOOL); | ||
| 473 | + | ||
| 466 | 474 | if (targets.needs_decompression == kNeedsDecompression) { | |
| 467 | 475 | __ DecompressTagged(register_with_slot_value, register_with_slot_value); | |
| 468 | 476 | targets.needs_decompression = kDoesNotNeedDecompression; | |
0 commit comments