Commit 46852d2
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 <qiuji@iscas.ac.cn>
Reviewed-by: Ji Qiu <qiuji@iscas.ac.cn>
Cr-Commit-Position: refs/heads/main@{#105464}
Refs: v8/v8@cd2c216
PR-URL: #61898
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
(cherry picked from commit 8405ee9)1 parent 784431d commit 46852d2
2 files changed
Lines changed: 8 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | 39 | # Reset this number to 0 on major V8 upgrades. | |
| 40 | 40 | # Increment by one for each non-official patch applied to deps/v8. | |
| 41 | - 'v8_embedder_string': '-node.15', | ||
| 41 | + 'v8_embedder_string': '-node.16', | ||
| 42 | 42 | ||
| 43 | 43 | ##### V8 defaults for Node.js ##### | |
| 44 | 44 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3834,7 +3834,8 @@ void SwitchStacks(MacroAssembler* masm, ExternalReference fn, | |||
| 3834 | 3834 | { | |
| 3835 | 3835 | FrameScope scope(masm, StackFrame::MANUAL); | |
| 3836 | 3836 | 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(); | ||
| 3838 | 3839 | int num_args = is_return ? 2 : 5; | |
| 3839 | 3840 | if (maybe_suspender.is_valid()) { | |
| 3840 | 3841 | num_args++; | |
@@ -3872,8 +3873,9 @@ void ReloadParentStack(MacroAssembler* masm, Register return_reg, | |||
| 3872 | 3873 | __ LoadWord(parent, MemOperand(active_stack, wasm::kStackParentOffset)); | |
| 3873 | 3874 | ||
| 3874 | 3875 | // 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}); | ||
| 3877 | 3879 | LoadJumpBuffer(masm, parent, false, tmp3); | |
| 3878 | 3880 | } | |
| 3879 | 3881 | ||
@@ -4179,8 +4181,8 @@ void Builtins::Generate_WasmFXReturn(MacroAssembler* masm) { | |||
| 4179 | 4181 | DEFINE_PINNED(parent, a2); | |
| 4180 | 4182 | __ Move(parent, MemOperand(active_stack, wasm::kStackParentOffset)); | |
| 4181 | 4183 | 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}); | ||
| 4184 | 4186 | LoadJumpBuffer(masm, parent, true, scratch); | |
| 4185 | 4187 | __ Trap(); | |
| 4186 | 4188 | } | |
0 commit comments