Address review partially

Author: Fidget-Spinner

Include/internal/pycore_code.h

@@ -529,7 +529,7 @@ typedef struct {
 
 PyAPI_FUNC(int) _Py_Instrument(PyCodeObject *co, PyInterpreterState *interp);
 
-extern _Py_CODEUNIT _Py_GetBaseCodeUnit(PyCodeObject *code, int offset);
+PyAPI_FUNC(_Py_CODEUNIT) _Py_GetBaseCodeUnit(PyCodeObject *code, int offset);
 
 extern int _PyInstruction_GetLength(PyCodeObject *code, int offset);
 

Modules/_testinternalcapi/test_cases.c.h

@@ -424,7 +424,10 @@
                     next_oparg = exec->vm_data.oparg;
                 }
                 #endif
-                assert(next_instr->op.code == STORE_FAST || next_instr->op.code == ENTER_EXECUTOR);
+                _PyFrame_SetStackPointer(frame, stack_pointer);
+                assert(_Py_GetBaseCodeUnit(_PyFrame_GetCode(frame),
+                                      next_instr - _PyFrame_GetBytecode(frame)).op.code == STORE_FAST);
+                stack_pointer = _PyFrame_GetStackPointer(frame);
                 #else
                 next_oparg = (int)CURRENT_OPERAND0_16();
                 #endif

Python/bytecodes.c

@@ -792,7 +792,8 @@ dummy_func(
                 next_oparg = exec->vm_data.oparg;
             }
 #endif
-            assert(next_instr->op.code == STORE_FAST || next_instr->op.code == ENTER_EXECUTOR);
+            assert(_Py_GetBaseCodeUnit(_PyFrame_GetCode(frame),
+                next_instr - _PyFrame_GetBytecode(frame)).op.code == STORE_FAST);
         #else
             next_oparg = (int)CURRENT_OPERAND0_16();
         #endif