Commit eec896c
deps: V8: backport 6a0a25abaed3
Original commit message:
[riscv] Fix sp handling in MacroAssembler::LeaveFrame
Keep sp <= fp to ensure that data right above fp doesn't get clobbered
by an inopportune signal and its handler.
Such clobbering can happen in e.g. Node.js when JIT-compiled code is
interrupted by a SIGCHLD handler.
Bug: None
Change-Id: Ief0836032ada7942e89f081f7605f61632c4d414
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/7540554
Reviewed-by: Ji Qiu <qiuji@iscas.ac.cn>
Commit-Queue: Yahan Lu (LuYahan) <yahan@iscas.ac.cn>
Reviewed-by: Rezvan Mahdavi Hezaveh <rezvan@chromium.org>
Cr-Commit-Position: refs/heads/main@{#105069}
Refs: v8/v8@6a0a25a
Co-authored-by: kxxt <rsworktech@outlook.com>
PR-URL: #61666
Reviewed-By: Richard Lau <richard.lau@ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>1 parent b6ae1fc commit eec896c
3 files changed
Lines changed: 4 additions & 2 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.19', | ||
| 41 | + 'v8_embedder_string': '-node.20', | ||
| 42 | 42 | ||
| 43 | 43 | ##### V8 defaults for Node.js ##### | |
| 44 | 44 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -300,6 +300,7 @@ Vadim Gorbachev <bmsdave@gmail.com> | |||
| 300 | 300 | Varun Varada <varuncvarada@gmail.com> | |
| 301 | 301 | Victor Costan <costan@gmail.com> | |
| 302 | 302 | Victor Polevoy <fx@thefx.co> | |
| 303 | + Vivian Wang <wangruikang@iscas.ac.cn> | ||
| 303 | 304 | Vlad Burlik <vladbph@gmail.com> | |
| 304 | 305 | Vladimir Kempik <vladimir.kempik@syntacore.com> | |
| 305 | 306 | Vladimir Krivosheev <develar@gmail.com> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6712,9 +6712,10 @@ void MacroAssembler::EnterFrame(StackFrame::Type type) { | |||
| 6712 | 6712 | ||
| 6713 | 6713 | void MacroAssembler::LeaveFrame(StackFrame::Type type) { | |
| 6714 | 6714 | ASM_CODE_COMMENT(this); | |
| 6715 | - AddWord(sp, fp, 2 * kSystemPointerSize); | ||
| 6715 | + Move(sp, fp); | ||
| 6716 | 6716 | LoadWord(ra, MemOperand(fp, 1 * kSystemPointerSize)); | |
| 6717 | 6717 | LoadWord(fp, MemOperand(fp, 0 * kSystemPointerSize)); | |
| 6718 | + AddWord(sp, sp, 2 * kSystemPointerSize); | ||
| 6718 | 6719 | } | |
| 6719 | 6720 | ||
| 6720 | 6721 | void MacroAssembler::EnterExitFrame(Register scratch, int stack_space, | |
0 commit comments