Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f18bb63

Browse files
committedJan 17, 2022
deps: V8: backport 77599ffe0a74
Original commit message: [riscv64] Add block before LoadAddress fix node.js DCHECK failed issue: riscv-collab/v8#514 Change-Id: I07f40e6aca05be3eb7304a43235185fd40ebc1f2 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3260979 Reviewed-by: ji qiu <[email protected]> Commit-Queue: ji qiu <[email protected]> Auto-Submit: Yahan Lu <[email protected]> Cr-Commit-Position: refs/heads/main@{#77750} Refs: v8/v8@77599ffe0a74
1 parent 81e50d8 commit f18bb63

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed
 

‎common.gypi

+1-1
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/baseline/riscv64/baseline-assembler-riscv64-inl.h

+1
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,7 @@ void BaselineAssembler::Switch(Register reg, int case_value_base,
438438
DCHECK(is_int32(imm64));
439439
int32_t Hi20 = (((int32_t)imm64 + 0x800) >> 12);
440440
int32_t Lo12 = (int32_t)imm64 << 20 >> 20;
441+
__ BlockTrampolinePoolFor(2);
441442
__ auipc(temp, Hi20); // Read PC + Hi20 into t6
442443
__ addi(temp, temp, Lo12); // jump PC + Hi20 + Lo12
443444

‎deps/v8/src/codegen/riscv64/macro-assembler-riscv64.cc

+1
Original file line numberDiff line numberDiff line change
@@ -3485,6 +3485,7 @@ void TurboAssembler::LoadAddress(Register dst, Label* target,
34853485
if (CalculateOffset(target, &offset, OffsetSize::kOffset32)) {
34863486
int32_t Hi20 = (((int32_t)offset + 0x800) >> 12);
34873487
int32_t Lo12 = (int32_t)offset << 20 >> 20;
3488+
BlockTrampolinePoolScope block_trampoline_pool(this);
34883489
auipc(dst, Hi20);
34893490
addi(dst, dst, Lo12);
34903491
} else {

0 commit comments

Comments
 (0)
Please sign in to comment.