Backed out changeset 99c34e47348b

The change broke test_gdb.

diff --git a/Objects/genobject.c b/Objects/genobject.c
index 9d93a761d7abe91b16419ebe3536d4d4fbf421e7..59f53cefcb35093d5695f27a3a39e558a1befc56 100644 (file)
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -186,7 +186,7 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc, int closing)
     f->f_back = tstate->frame;
 
     gen->gi_running = 1;
-    result = tstate->interp->eval_frame(f, exc);
+    result = PyEval_EvalFrameEx(f, exc);
     gen->gi_running = 0;
 
     /* Don't keep the reference to f_back any longer than necessary.  It

diff --git a/Python/ceval.c b/Python/ceval.c
index c4507fb74ddae6a6bbaf42f5c9ad8cfd4bb82ef5..c6c6e05650b076c1d94b16ad6653d2ec2bf20251 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4069,7 +4069,7 @@ _PyEval_EvalCodeWithName(PyObject *_co, PyObject *globals, PyObject *locals,
         return gen;
     }
 
-    retval = tstate->interp->eval_frame(f, 0);
+    retval = PyEval_EvalFrameEx(f,0);
 
 fail: /* Jump here from prelude on failure */
 
@@ -4822,7 +4822,7 @@ _PyFunction_FastCall(PyCodeObject *co, PyObject **args, Py_ssize_t nargs,
         Py_INCREF(*args);
         fastlocals[i] = *args++;
     }
-    result = tstate->interp->eval_frame(f,0);
+    result = PyEval_EvalFrameEx(f,0);
 
     ++tstate->recursion_depth;
     Py_DECREF(f);