Skip to content

[v20.x backport]deps: V8: cherry-pick 6b1b9bca2a8 #59662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Xiao-Tao wants to merge 1 commit into from
Closed

[v20.x backport]deps: V8: cherry-pick 6b1b9bca2a8 #59662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
deps: V8: cherry-pick 6b1b9bca2a8 
Origin commit message:

    [loong64][codegen] Avoid memory access under stack pointer

    According to LoongArch ABI doc chapter 8.2:
      "Procedures must not assume the persistence on-stack data of which
       the addresses lie below the stack pointer."

    Change-Id: I92735e052227495ac9884c4290b57eaffbf905e1
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6786372
    Auto-Submit: Zhao Jiazhong <zhaojiazhong-hf@loongson.cn>
    Reviewed-by: Matthias Liedtke <mliedtke@chromium.org>
    Commit-Queue: Matthias Liedtke <mliedtke@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#101634}

Refs: v8/v8@6b1b9bc
  • Loading branch information
@Xiao-Tao
Xiao-Tao authored and Mingtao Zhou committed Aug 28, 2025
commit c1f2f0df343fbc8f6fa909df8b8f93976fbf34f7
2 changes: 1 addition & 1 deletion common.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.30',
'v8_embedder_string': '-node.31',

##### V8 defaults for Node.js #####

Expand Down
20 changes: 11 additions & 9 deletions deps/v8/src/codegen/loong64/macro-assembler-loong64.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,21 +1256,24 @@ void MacroAssembler::li(Register rd, Operand j, LiFlags mode) {
}

void MacroAssembler::MultiPush(RegList regs) {
int16_t stack_offset = 0;
int16_t num_to_push = regs.Count();
int16_t stack_offset = num_to_push * kSystemPointerSize;

Sub_d(sp, sp, Operand(stack_offset));
for (int16_t i = kNumRegisters - 1; i >= 0; i--) {
if ((regs.bits() & (1 << i)) != 0) {
stack_offset -= kSystemPointerSize;
St_d(ToRegister(i), MemOperand(sp, stack_offset));
}
}
addi_d(sp, sp, stack_offset);
}

void MacroAssembler::MultiPush(RegList regs1, RegList regs2) {
DCHECK((regs1 & regs2).is_empty());
int16_t stack_offset = 0;
int16_t num_to_push = regs1.Count() + regs2.Count();
int16_t stack_offset = num_to_push * kSystemPointerSize;

Sub_d(sp, sp, Operand(stack_offset));
for (int16_t i = kNumRegisters - 1; i >= 0; i--) {
if ((regs1.bits() & (1 << i)) != 0) {
stack_offset -= kSystemPointerSize;
Expand All @@ -1283,15 +1286,16 @@ void MacroAssembler::MultiPush(RegList regs1, RegList regs2) {
St_d(ToRegister(i), MemOperand(sp, stack_offset));
}
}
addi_d(sp, sp, stack_offset);
}

void MacroAssembler::MultiPush(RegList regs1, RegList regs2, RegList regs3) {
DCHECK((regs1 & regs2).is_empty());
DCHECK((regs1 & regs3).is_empty());
DCHECK((regs2 & regs3).is_empty());
int16_t stack_offset = 0;
int16_t num_to_push = regs1.Count() + regs2.Count() + regs3.Count();
int16_t stack_offset = num_to_push * kSystemPointerSize;

Sub_d(sp, sp, Operand(stack_offset));
for (int16_t i = kNumRegisters - 1; i >= 0; i--) {
if ((regs1.bits() & (1 << i)) != 0) {
stack_offset -= kSystemPointerSize;
Expand All @@ -1310,7 +1314,6 @@ void MacroAssembler::MultiPush(RegList regs1, RegList regs2, RegList regs3) {
St_d(ToRegister(i), MemOperand(sp, stack_offset));
}
}
addi_d(sp, sp, stack_offset);
}

void MacroAssembler::MultiPop(RegList regs) {
Expand Down Expand Up @@ -3563,9 +3566,8 @@ void MacroAssembler::EnterFrame(StackFrame::Type type) {

void MacroAssembler::LeaveFrame(StackFrame::Type type) {
ASM_CODE_COMMENT(this);
addi_d(sp, fp, 2 * kSystemPointerSize);
Ld_d(ra, MemOperand(fp, 1 * kSystemPointerSize));
Ld_d(fp, MemOperand(fp, 0 * kSystemPointerSize));
Move(sp, fp);
Pop(ra, fp);
}

void MacroAssembler::EnterExitFrame(int stack_space,
Expand Down
Loading