Remove LOAD_ERROR instruction.

python · markshannon · Nov 3, 2022 · Nov 1, 2022 · Nov 2, 2022 · Nov 2, 2022
commit f86c5e464fed4e7732d9798071639d727cdf6813
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Include/opcode.h b/Include/opcode.h
diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -192,7 +192,7 @@ def pseudo_op(name, op, real_ops):
 def_op('DELETE_DEREF', 139)
 hasfree.append(139)
 jrel_op('JUMP_BACKWARD', 140)    # Number of words to skip (backwards)
-def_op('LOAD_ERROR', 141)
+
 def_op('CALL_FUNCTION_EX', 142)  # Flags
 
 def_op('EXTENDED_ARG', 144)

diff --git a/Python/ceval.c b/Python/ceval.c
@@ -2175,29 +2175,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             goto exception_unwind;
         }
 
-        TARGET(LOAD_ERROR) {
-            PyObject *value;
-            switch(oparg) {
-                case 0:
-                    value = PyExc_AssertionError;
-                    break;
-                case 1:
-                    value = PyExc_StopIteration;
-                    break;
-                case 2:
-                    value = PyExc_RuntimeError;
-                    break;
-                case 3:
-                    value = PyExc_StopAsyncIteration;
-                    break;
-                default:
-                    Py_UNREACHABLE();
-            }
-            Py_INCREF(value);
-            PUSH(value);
-            DISPATCH();
-        }
-
         TARGET(STOPITERATION_ERROR) {
             assert(frame->owner == FRAME_OWNED_BY_GENERATOR);
             PyObject *exc = TOP();

@@ -1257,7 +1257,6 @@ stack_effect(int opcode, int oparg, int jump)
             return (oparg & FVS_MASK) == FVS_HAVE_SPEC ? -1 : 0;
         case LOAD_METHOD:
             return 1;
-        case LOAD_ERROR:
         case LOAD_ASSERTION_ERROR:
             return 1;
         case LIST_TO_TUPLE:

diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h