remove PY_EXC_INFO_STACK_SIZE

python · markshannon · Dec 17, 2021 · Dec 7, 2021 · Dec 7, 2021 · Dec 9, 2021
commit 80b1e90bfef9e1c6679f9eedc7556cb1ab98a928
diff --git a/Include/internal/pycore_pyerrors.h b/Include/internal/pycore_pyerrors.h
@@ -106,9 +106,6 @@ PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalRefcountErrorFunc(
 #define _Py_FatalRefcountError(message) _Py_FatalRefcountErrorFunc(__func__, message)
 
 
-/* number of items stored in the stack for each exception */
-#define PY_EXC_INFO_STACK_SIZE 1
-
 #ifdef __cplusplus
 }
 #endif

@@ -19,7 +19,7 @@
 #include "pycore_long.h"          // _PyLong_GetZero()
 #include "pycore_object.h"        // _PyObject_GC_TRACK()
 #include "pycore_moduleobject.h"  // PyModuleObject
-#include "pycore_pyerrors.h"      // _PyErr_Fetch(), PY_EXC_INFO_STACK_SIZE
+#include "pycore_pyerrors.h"      // _PyErr_Fetch()
 #include "pycore_pylifecycle.h"   // _PyErr_Print()
 #include "pycore_pymem.h"         // _PyMem_IsPtrFreed()
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
@@ -2727,7 +2727,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
         }
 
         TARGET(POP_EXCEPT_AND_RERAISE) {
-            PyObject *lasti = PEEK(PY_EXC_INFO_STACK_SIZE + 1);
+            PyObject *lasti = PEEK(2);
             if (PyLong_Check(lasti)) {
                 frame->f_lasti = PyLong_AsLong(lasti);
                 assert(!_PyErr_Occurred(tstate));
@@ -2753,7 +2753,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
 
         TARGET(RERAISE) {
             if (oparg) {
-                PyObject *lasti = PEEK(oparg + PY_EXC_INFO_STACK_SIZE);
+                PyObject *lasti = PEEK(oparg + 1);
                 if (PyLong_Check(lasti)) {
                     frame->f_lasti = PyLong_AsLong(lasti);
                     assert(!_PyErr_Occurred(tstate));
@@ -4404,8 +4404,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             exc = PyExceptionInstance_Class(val);
             tb = PyException_GetTraceback(val);
             Py_XDECREF(tb);
-            assert(PyLong_Check(PEEK(1 + 2 * PY_EXC_INFO_STACK_SIZE)));
-            exit_func = PEEK(2 + 2 * PY_EXC_INFO_STACK_SIZE);
+            assert(PyLong_Check(PEEK(3)));
+            exit_func = PEEK(4);
             PyObject *stack[4] = {NULL, exc, val, tb};
             res = PyObject_Vectorcall(exit_func, stack + 1,
                     3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);

@@ -27,7 +27,6 @@
 #include "pycore_ast.h"           // _PyAST_GetDocString()
 #include "pycore_compile.h"       // _PyFuture_FromAST()
 #include "pycore_code.h"          // _PyCode_New()
-#include "pycore_pyerrors.h"      // PY_EXC_INFO_STACK_SIZE
 #include "pycore_pymem.h"         // _PyMem_IsPtrFreed()
 #include "pycore_long.h"          // _PyLong_GetZero()
 #include "pycore_symtable.h"      // PySTEntryObject
@@ -1049,9 +1048,9 @@ stack_effect(int opcode, int oparg, int jump)
         case POP_BLOCK:
             return 0;
         case POP_EXCEPT:
-            return -PY_EXC_INFO_STACK_SIZE;
+            return -1;
         case POP_EXCEPT_AND_RERAISE:
-            return -(1 + 2 * PY_EXC_INFO_STACK_SIZE);
+            return -3;
 
         case STORE_NAME:
             return -1;
@@ -1123,23 +1122,23 @@ stack_effect(int opcode, int oparg, int jump)
             /* 0 in the normal flow.
              * Restore the stack position and push 1 value before jumping to
              * the handler if an exception be raised. */
-            return jump ? PY_EXC_INFO_STACK_SIZE : 0;
+            return jump ? 1 : 0;
         case SETUP_CLEANUP:
             /* As SETUP_FINALLY, but pushes lasti as well */
-            return jump ? 1 + PY_EXC_INFO_STACK_SIZE : 0;
+            return jump ? 2 : 0;
         case SETUP_WITH:
             /* 0 in the normal flow.
              * Restore the stack position to the position before the result
              * of __(a)enter__ and push 2 values before jumping to the handler
              * if an exception be raised. */
-            return jump ? -1 + PY_EXC_INFO_STACK_SIZE + 1 : 0;
+            return jump ? 1 : 0;
 
         case PREP_RERAISE_STAR:
              return 0;
         case RERAISE:
-            return -PY_EXC_INFO_STACK_SIZE;
+            return -1;
         case PUSH_EXC_INFO:
-            return PY_EXC_INFO_STACK_SIZE;
+            return 1;
 
         case WITH_EXCEPT_START:
             return 1;
@@ -1200,7 +1199,7 @@ stack_effect(int opcode, int oparg, int jump)
         case GET_YIELD_FROM_ITER:
             return 0;
         case END_ASYNC_FOR:
-            return -(1 + PY_EXC_INFO_STACK_SIZE);
+            return -2;
         case FORMAT_VALUE:
             /* If there's a fmt_spec on the stack, we go from 2->1,
                else 1->1. */
@@ -5421,7 +5420,7 @@ compiler_with_except_finish(struct compiler *c, basicblock * cleanup) {
         return 0;
     ADDOP_JUMP(c, POP_JUMP_IF_TRUE, exit);
     NEXT_BLOCK(c);
-    ADDOP_I(c, RERAISE, 1 + PY_EXC_INFO_STACK_SIZE);
+    ADDOP_I(c, RERAISE, 2);
     compiler_use_next_block(c, cleanup);
     ADDOP(c, POP_EXCEPT_AND_RERAISE);
     compiler_use_next_block(c, exit);
@@ -5557,7 +5556,7 @@ compiler_async_with(struct compiler *c, stmt_ty s, int pos)
     E:  WITH_EXCEPT_START (calls EXPR.__exit__)
         POP_JUMP_IF_TRUE T:
         RERAISE
-    T:  POP_TOP * PY_EXC_INFO_STACK_SIZE (remove exception from stack)
+    T:  POP_TOP (remove exception from stack)
         POP_EXCEPT
         POP_TOP
     EXIT:
@@ -7338,7 +7337,7 @@ assemble_emit_exception_table_entry(struct assembler *a, int start, int end, bas
     int size = end-start;
     assert(end > start);
     int target = handler->b_offset;
-    int depth = handler->b_startdepth - PY_EXC_INFO_STACK_SIZE;
+    int depth = handler->b_startdepth - 1;
     if (handler->b_preserve_lasti) {
         depth -= 1;
     }