summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-12-09 17:51:13 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-12-09 17:51:13 (GMT)
commit59a73276e9440e6227f28189f75b8fe1e1f2b167 (patch)
tree5036025e142cf610a793f25f251f8895d4ba274c
parent22f18750a53b0f95b27c83c822ee2f44ea5f6495 (diff)
downloadcpython-59a73276e9440e6227f28189f75b8fe1e1f2b167.zip
cpython-59a73276e9440e6227f28189f75b8fe1e1f2b167.tar.gz
cpython-59a73276e9440e6227f28189f75b8fe1e1f2b167.tar.bz2
Backed out changeset 99c34e47348b
The change broke test_gdb.
-rw-r--r--Objects/genobject.c2
-rw-r--r--Python/ceval.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/Objects/genobject.c b/Objects/genobject.c
index 9d93a76..59f53ce 100644
--- 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 c4507fb..c6c6e05 100644
--- 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);