Don't RESUME after throw

Author: brandtbucher

Lib/test/test_dis.py

@@ -508,29 +508,26 @@ async def _asyncwith(c):
            RETURN_VALUE
 
 %3d     >> THROW_BACKWARD          23 (to 114)
-           RESUME                   3
-           JUMP_BACKWARD_NO_INTERRUPT    28 (to 16)
-        >> THROW_BACKWARD           9 (to 92)
-           RESUME                   3
-           JUMP_BACKWARD_NO_INTERRUPT    14 (to 50)
+           JUMP_BACKWARD_NO_INTERRUPT    27 (to 16)
+        >> THROW_BACKWARD           8 (to 88)
+           JUMP_BACKWARD_NO_INTERRUPT    12 (to 50)
         >> PUSH_EXC_INFO
            WITH_EXCEPT_START
            GET_AWAITABLE            2
            LOAD_CONST               0 (None)
-        >> SEND                     6 (to 100)
+        >> SEND                     5 (to 94)
         >> YIELD_VALUE              6
            RESUME                   3
-        >> JUMP_BACKWARD_NO_INTERRUPT     4 (to 86)
-        >> THROW_FORWARD            2 (to 100)
-           RESUME                   3
-           JUMP_BACKWARD_NO_INTERRUPT     6 (to 88)
-        >> POP_JUMP_FORWARD_IF_TRUE     1 (to 104)
+        >> JUMP_BACKWARD_NO_INTERRUPT     4 (to 82)
+        >> THROW_FORWARD            1 (to 94)
+           JUMP_BACKWARD_NO_INTERRUPT     5 (to 84)
+        >> POP_JUMP_FORWARD_IF_TRUE     1 (to 98)
            RERAISE                  2
         >> POP_TOP
            POP_EXCEPT
            POP_TOP
            POP_TOP
-           JUMP_BACKWARD           28 (to 58)
+           JUMP_BACKWARD           25 (to 58)
         >> COPY                     3
            POP_EXCEPT
            RERAISE                  1

Python/ceval.c

@@ -2671,7 +2671,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             if (found < 0) {
                 if (PyErr_GivenExceptionMatches(exc_value, PyExc_GeneratorExit))
                 {
-                    PyErr_Clear();
+                    _PyErr_Clear(tstate);
                     _PyErr_Restore(tstate, exc_type, exc_value, exc_traceback);
                 }
                 goto exception_unwind;

Python/compile.c

@@ -1984,7 +1984,6 @@ compiler_add_yield_from(struct compiler *c, int await)
 
     USE_LABEL(c, thrown);
     ADDOP_JUMP(c, THROW, stop);
-    ADDOP_I(c, RESUME, await ? 3 : 2);
     ADDOP_JUMP(c, JUMP_NO_INTERRUPT, yield);
 
     USE_LABEL(c, stop);