Skip to content

Commit 08c824f

Browse files
luyahantargos
authored andcommitted
deps: V8: cherry-pick cd2c216e7658
Original commit message: [riscv][jspi] Clear EPT entry on stack return Port commit 54cf5fa964f0734a8277ea2837aa2e4168e3240a Bug: 485784597 Change-Id: I4a7e12d9047f7a4257be4711d9d6645d42f02a38 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/7608971 Commit-Queue: Ji Qiu <[email protected]> Reviewed-by: Ji Qiu <[email protected]> Cr-Commit-Position: refs/heads/main@{#105464} Refs: v8/v8@cd2c216
1 parent c7c2b12 commit 08c824f

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

common.gypi

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

4141
# Reset this number to 0 on major V8 upgrades.
4242
# Increment by one for each non-official patch applied to deps/v8.
43-
'v8_embedder_string': '-node.15',
43+
'v8_embedder_string': '-node.16',
4444

4545
##### V8 defaults for Node.js #####
4646

deps/v8/src/builtins/riscv/builtins-riscv.cc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3834,7 +3834,8 @@ void SwitchStacks(MacroAssembler* masm, ExternalReference fn,
38343834
{
38353835
FrameScope scope(masm, StackFrame::MANUAL);
38363836
DCHECK(old_stack.is_valid());
3837-
bool is_return = fn == ExternalReference::wasm_return_stack();
3837+
bool is_return = fn == ExternalReference::wasm_return_jspi_stack() ||
3838+
fn == ExternalReference::wasm_return_wasmfx_stack();
38383839
int num_args = is_return ? 2 : 5;
38393840
if (maybe_suspender.is_valid()) {
38403841
num_args++;
@@ -3872,8 +3873,9 @@ void ReloadParentStack(MacroAssembler* masm, Register return_reg,
38723873
__ LoadWord(parent, MemOperand(active_stack, wasm::kStackParentOffset));
38733874

38743875
// Switch stack!
3875-
SwitchStacks(masm, ExternalReference::wasm_return_stack(), parent, nullptr,
3876-
no_reg, tmp3, {return_reg, return_value, context, parent});
3876+
SwitchStacks(masm, ExternalReference::wasm_return_jspi_stack(), parent,
3877+
nullptr, no_reg, tmp3,
3878+
{return_reg, return_value, context, parent});
38773879
LoadJumpBuffer(masm, parent, false, tmp3);
38783880
}
38793881

@@ -4179,8 +4181,8 @@ void Builtins::Generate_WasmFXReturn(MacroAssembler* masm) {
41794181
DEFINE_PINNED(parent, a2);
41804182
__ Move(parent, MemOperand(active_stack, wasm::kStackParentOffset));
41814183
DEFINE_REG(scratch);
4182-
SwitchStacks(masm, ExternalReference::wasm_return_stack(), parent, nullptr,
4183-
no_reg, scratch, {parent, arg_buffer});
4184+
SwitchStacks(masm, ExternalReference::wasm_return_wasmfx_stack(), parent,
4185+
nullptr, no_reg, scratch, {parent, arg_buffer});
41844186
LoadJumpBuffer(masm, parent, true, scratch);
41854187
__ Trap();
41864188
}

0 commit comments

Comments
 (0)