From: Ivy Xu <fakeshadow1337@gmail.com>
Date: Mon, 29 Jun 2026 14:47:21 +0000 (+0800)
Subject: gh-151040: Fix `test_c_stack_unwind` on RISC-V (#152370)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b0c05f14807a43d070127b3d8eac1af8de27f28;p=thirdparty%2FPython%2Fcpython.git

gh-151040: Fix `test_c_stack_unwind` on RISC-V (#152370)
---

diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
index 6506bd53b037..f6ff7820821c 100644
--- a/Modules/_testinternalcapi.c
+++ b/Modules/_testinternalcapi.c
@@ -98,6 +98,11 @@ static const uintptr_t min_frame_pointer_addr = 0x1000;
 // https://refspecs.linuxfoundation.org/ELF/ppc64/PPC-elf64abi-1.9.html#STACK
 #  define FRAME_POINTER_NEXT_OFFSET 0
 #  define FRAME_POINTER_RETURN_OFFSET 2
+#elif defined(__riscv)
+// RISC-V saves the return address at fp[-1], and the previous frame pointer at fp[-2].
+// See: https://riscv-non-isa.github.io/riscv-elf-psabi-doc/#_frame_pointer_convention
+#  define FRAME_POINTER_NEXT_OFFSET -2
+#  define FRAME_POINTER_RETURN_OFFSET -1
 #elif defined(__loongarch__)
 // On LoongArch, the frame pointer is the caller's stack pointer.
 // The saved frame pointer is stored at fp[-2], and the return