Skip to content

Commit 35e479a

Browse files
luyahankxxt
authored andcommitted
deps: V8: cherry-pick 7f436a0b44a1
Original commit message: [riscv] Check trampoline before Constant pool in Release mode Change-Id: I9645cded9328dabb2c11c7859b998c838b95f97b Refs: v8/v8@7f436a0
1 parent a1db135 commit 35e479a

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.14',
41+
'v8_embedder_string': '-node.15',
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
@@ -4941,10 +4941,9 @@ void MacroAssembler::Jump(Register target, Condition cond, Register rs,
49414941
jr(target);
49424942
DEBUG_PRINTF("\tCheckTrampolinePool pc_offset:%d %d\n", pc_offset(),
49434943
next_buffer_check() - ConstpoolComputesize());
4944-
if (!is_trampoline_emitted() && v8_flags.debug_code &&
4944+
if (!is_trampoline_emitted() &&
49454945
pc_offset() >= (next_buffer_check() - ConstpoolComputesize())) {
4946-
// Debug mode will emit more instrs than Release mode.
4947-
// so we need to check trampoline pool before Constant pool.
4946+
// We need to check trampoline pool before Constant pool.
49484947
// Here need to emit trampoline first.
49494948
// Jump(ra, al) will block trampoline pool for 1 instr.
49504949
nop();

0 commit comments

Comments
 (0)