From 4b3d5b604210f68005ef64d5346ca169385f5acf Mon Sep 17 00:00:00 2001 From: Brandt Bucher Date: Wed, 26 Mar 2025 12:00:16 -0700 Subject: GH-119866: Don't clear frame->stackpointer on release builds (GH-131750) --- Include/internal/pycore_interpframe.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Include/internal/pycore_interpframe.h b/Include/internal/pycore_interpframe.h index 097da4e..1d373d5 100644 --- a/Include/internal/pycore_interpframe.h +++ b/Include/internal/pycore_interpframe.h @@ -163,15 +163,17 @@ _PyFrame_GetLocalsArray(_PyInterpreterFrame *frame) return frame->localsplus; } -/* Fetches the stack pointer, and sets stackpointer to NULL. - Having stackpointer == NULL ensures that invalid - values are not visible to the cycle GC. */ +// Fetches the stack pointer, and (on debug builds) sets stackpointer to NULL. +// Having stackpointer == NULL makes it easier to catch missing stack pointer +// spills/restores (which could expose invalid values to the GC) using asserts. static inline _PyStackRef* _PyFrame_GetStackPointer(_PyInterpreterFrame *frame) { assert(frame->stackpointer != NULL); _PyStackRef *sp = frame->stackpointer; +#ifndef NDEBUG frame->stackpointer = NULL; +#endif return sp; } -- cgit v0.12