Skip to content

Commit 99feb6d

Browse files
miladfarcatargos
authored andcommitted
deps: V8: cherry-pick 6c3fce92398a
Original commit message: Fix arg_buffer under Generate_WasmFXSuspend Also change the tmp register passed to LoadJumpBuffer to avoid overwriting arg_buffer. Change-Id: I72b83edf722481ca7018731d36e1939620612e97 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/7212934 Reviewed-by: John <[email protected]> Commit-Queue: Milad Farazmand <[email protected]> Cr-Commit-Position: refs/heads/main@{#104032} Refs: v8/v8@6c3fce9
1 parent c6c65f4 commit 99feb6d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
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.11',
41+
'v8_embedder_string': '-node.12',
4242

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3558,7 +3558,7 @@ void Builtins::Generate_WasmFXSuspend(MacroAssembler* masm) {
35583558
__ EnterFrame(StackFrame::WASM_STACK_EXIT);
35593559
Register tag = WasmFXSuspendDescriptor::GetRegisterParameter(0);
35603560
Register cont = WasmFXSuspendDescriptor::GetRegisterParameter(1);
3561-
Register arg_buffer = WasmFXResumeDescriptor::GetRegisterParameter(1);
3561+
Register arg_buffer = WasmFXSuspendDescriptor::GetRegisterParameter(2);
35623562
Label resume;
35633563
__ Push(arg_buffer);
35643564
__ Push(cont, kContextRegister);
@@ -3587,8 +3587,8 @@ void Builtins::Generate_WasmFXSuspend(MacroAssembler* masm) {
35873587

35883588
__ bind(&ok);
35893589
DCHECK_EQ(cont, kReturnRegister0);
3590-
DCHECK(!AreAliased(r6, arg_buffer, target_stack));
3591-
LoadJumpBuffer(masm, target_stack, true, r6);
3590+
DCHECK(!AreAliased(ip, arg_buffer, target_stack));
3591+
LoadJumpBuffer(masm, target_stack, true, ip);
35923592
__ Trap();
35933593
__ bind(&resume);
35943594
__ Move(kReturnRegister0, WasmFXResumeDescriptor::GetRegisterParameter(1));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3565,7 +3565,7 @@ void Builtins::Generate_WasmFXSuspend(MacroAssembler* masm) {
35653565
__ EnterFrame(StackFrame::WASM_STACK_EXIT);
35663566
Register tag = WasmFXSuspendDescriptor::GetRegisterParameter(0);
35673567
Register cont = WasmFXSuspendDescriptor::GetRegisterParameter(1);
3568-
Register arg_buffer = WasmFXResumeDescriptor::GetRegisterParameter(1);
3568+
Register arg_buffer = WasmFXSuspendDescriptor::GetRegisterParameter(2);
35693569
Label resume;
35703570
__ Push(arg_buffer);
35713571
__ Push(cont, kContextRegister);
@@ -3594,8 +3594,8 @@ void Builtins::Generate_WasmFXSuspend(MacroAssembler* masm) {
35943594

35953595
__ bind(&ok);
35963596
DCHECK_EQ(cont, kReturnRegister0);
3597-
DCHECK(!AreAliased(r5, arg_buffer, target_stack));
3598-
LoadJumpBuffer(masm, target_stack, true, r5);
3597+
DCHECK(!AreAliased(r1, arg_buffer, target_stack));
3598+
LoadJumpBuffer(masm, target_stack, true, r1);
35993599
__ Trap();
36003600
__ bind(&resume);
36013601
__ Move(kReturnRegister0, WasmFXResumeDescriptor::GetRegisterParameter(1));

0 commit comments

Comments
 (0)