pythongh-133713: Compare the f->stackpointer to the result of _PyFrame_Stackbase(f) (pythonGH-133714)

nybblista · taegyunkim · commit fa55bd2a56c8 · 2025-07-29T10:50:42.000-04:00
diff --git a/Include/internal/pycore_interpframe.h b/Include/internal/pycore_interpframe.h
@@ -48,13 +48,13 @@ static inline _PyStackRef *_PyFrame_Stackbase(_PyInterpreterFrame *f) {
 }
 
 static inline _PyStackRef _PyFrame_StackPeek(_PyInterpreterFrame *f) {
-    assert(f->stackpointer >  f->localsplus + _PyFrame_GetCode(f)->co_nlocalsplus);
+    assert(f->stackpointer > _PyFrame_Stackbase(f));
     assert(!PyStackRef_IsNull(f->stackpointer[-1]));
     return f->stackpointer[-1];
 }
 
 static inline _PyStackRef _PyFrame_StackPop(_PyInterpreterFrame *f) {
-    assert(f->stackpointer >  f->localsplus + _PyFrame_GetCode(f)->co_nlocalsplus);
+    assert(f->stackpointer > _PyFrame_Stackbase(f));
     f->stackpointer--;
     return *f->stackpointer;
 }

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,13 @@ static inline _PyStackRef _PyFrame_Stackbase(_PyInterpreterFrame f) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`static inline _PyStackRef _PyFrame_StackPeek(_PyInterpreterFrame *f) {`
`51`		`- assert(f->stackpointer > f->localsplus + _PyFrame_GetCode(f)->co_nlocalsplus);`
	`51`	`+ assert(f->stackpointer > _PyFrame_Stackbase(f));`
`52`	`52`	`assert(!PyStackRef_IsNull(f->stackpointer[-1]));`
`53`	`53`	`return f->stackpointer[-1];`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`static inline _PyStackRef _PyFrame_StackPop(_PyInterpreterFrame *f) {`
`57`		`- assert(f->stackpointer > f->localsplus + _PyFrame_GetCode(f)->co_nlocalsplus);`
	`57`	`+ assert(f->stackpointer > _PyFrame_Stackbase(f));`
`58`	`58`	`f->stackpointer--;`
`59`	`59`	`return *f->stackpointer;`
`60`	`60`	`}`