Fix some yield from and await tracebacks

brandtbucher · brandtbucher · commit cdf7fc4bd13f · 2022-08-15T08:53:34.000-07:00
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -2674,11 +2674,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
                     PyErr_Clear();
                     _PyErr_Restore(tstate, exc_type, exc_value, exc_traceback);
                 }
-                goto error;
+                goto exception_unwind;
             }
             if (found == 0) {
                 _PyErr_Restore(tstate, exc_type, exc_value, exc_traceback);
-                goto error;
+                goto exception_unwind;
             }
             PyObject *retval = PyObject_CallFunctionObjArgs(
                 throw, exc_type, exc_value, exc_traceback, NULL);
@@ -2697,7 +2697,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
                                frame);
             }
             if (_PyGen_FetchStopIterationValue(&TOP())) {
-                goto error;
+                goto exception_unwind;
             }
             Py_DECREF(yieldfrom);
             JUMPBY(oparg);

Original file line number	Diff line number	Diff line change
`@@ -2674,11 +2674,11 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, _PyInterpreterFrame frame, int`
`2674`	`2674`	`PyErr_Clear();`
`2675`	`2675`	`_PyErr_Restore(tstate, exc_type, exc_value, exc_traceback);`
`2676`	`2676`	`}`
`2677`		`- goto error;`
	`2677`	`+ goto exception_unwind;`
`2678`	`2678`	`}`
`2679`	`2679`	`if (found == 0) {`
`2680`	`2680`	`_PyErr_Restore(tstate, exc_type, exc_value, exc_traceback);`
`2681`		`- goto error;`
	`2681`	`+ goto exception_unwind;`
`2682`	`2682`	`}`
`2683`	`2683`	`PyObject *retval = PyObject_CallFunctionObjArgs(`
`2684`	`2684`	`throw, exc_type, exc_value, exc_traceback, NULL);`
`@@ -2697,7 +2697,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, _PyInterpreterFrame frame, int`
`2697`	`2697`	`frame);`
`2698`	`2698`	`}`
`2699`	`2699`	`if (_PyGen_FetchStopIterationValue(&TOP())) {`
`2700`		`- goto error;`
	`2700`	`+ goto exception_unwind;`
`2701`	`2701`	`}`
`2702`	`2702`	`Py_DECREF(yieldfrom);`
`2703`	`2703`	`JUMPBY(oparg);`