Skip to content

Commit 98cbf7d

Browse files
luyahankxxt
authored andcommitted
deps: V8: cherry-pick 394a8053b59e
Original commit message: [riscv] Check trampoline before Constant pool in Release mode Change-Id: I9645cded9328dabb2c11c7859b998c838b95f97b Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6653368 Commit-Queue: Ji Qiu <qiuji@iscas.ac.cn> Reviewed-by: Ji Qiu <qiuji@iscas.ac.cn> Cr-Commit-Position: refs/heads/main@{#100935} Refs: v8/v8@394a805
1 parent 5f16b76 commit 98cbf7d

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

common.gypi

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

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.33',
41+
'v8_embedder_string': '-node.34',
4242

4343
##### V8 defaults for Node.js #####
4444

deps/v8/src/codegen/riscv/macro-assembler-riscv.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4930,10 +4930,9 @@ void MacroAssembler::Jump(Register target, Condition cond, Register rs,
49304930
jr(target);
49314931
DEBUG_PRINTF("\tCheckTrampolinePool pc_offset:%d %d\n", pc_offset(),
49324932
next_buffer_check() - ConstpoolComputesize());
4933-
if (!is_trampoline_emitted() && v8_flags.debug_code &&
4933+
if (!is_trampoline_emitted() &&
49344934
pc_offset() >= (next_buffer_check() - ConstpoolComputesize())) {
4935-
// Debug mode will emit more instrs than Release mode.
4936-
// so we need to check trampoline pool before Constant pool.
4935+
// We need to check trampoline pool before Constant pool.
49374936
// Here need to emit trampoline first.
49384937
// Jump(ra, al) will block trampoline pool for 1 instr.
49394938
nop();

0 commit comments

Comments
 (0)