Make sure that asserts work correctly when neither NDEBUG nor PyDEBUG are defined

Author: markshannon

Include/internal/pycore_interpframe.h

@@ -265,6 +265,18 @@ _PyFrame_StackPointerInvalidate(_PyInterpreterFrame *frame)
 #endif
 }
 
+static inline void
+_PyFrame_StackAssertInvalid(_PyInterpreterFrame *frame)
+{
+#ifdef Py_DEBUG
+/* Avoid bloating the JIT code */
+#ifndef _Py_JIT
+    assert(frame->stackpointer_valid == 0);
+#endif
+#endif
+}
+
+
 /* Determine whether a frame is incomplete.
  * A frame is incomplete if it is part way through
  * creating cell objects or a generator or coroutine.

Lib/test/test_generated_cases.py

@@ -1536,7 +1536,7 @@ def test_stack_reload_only(self):
             INSTRUCTION_STATS(BALANCED);
             // Explicit stack reload
             stack_pointer = _PyFrame_GetStackPointer(frame);
-            assert(frame->stackpointer_valid == 0);
+            _PyFrame_StackAssertInvalid(frame);
             DISPATCH();
         }
         """

Modules/_testinternalcapi/test_cases.c.h

@@ -4666,7 +4666,9 @@ dummy_func(
             tstate->py_recursion_remaining--;
             RELOAD_STACK();
             LOAD_IP(0);
+            #ifdef Py_DEBUG
             assert(frame->previous->stackpointer_valid == 1);
+            #endif
             DTRACE_FUNCTION_ENTRY();
             LLTRACE_RESUME_FRAME();
         }
@@ -6480,7 +6482,7 @@ dummy_func(
         }
 
         label(error) {
-            assert(frame->stackpointer_valid == 0);
+            _PyFrame_StackAssertInvalid(frame);
             /* Double-check exception status. */
 #ifdef NDEBUG
             if (!_PyErr_Occurred(tstate)) {
@@ -6599,7 +6601,9 @@ dummy_func(
         }
 
         spilled label(start_frame) {
+            #ifdef Py_DEBUG
             assert(frame->stackpointer_valid == 1);
+            #endif
             int too_deep = _Py_EnterRecursivePy(tstate);
             if (too_deep) {
                 goto exit_unwind_notrace;