Inline PyEval_EvalFrameEx() in callers

vstinner · vstinner · commit 0ca246c5e7bc · 2016-12-09T17:12:17.000+01:00
The PEP 523 modified PyEval_EvalFrameEx(): it's now an indirection to
interp-&gt;eval_frame().

Inline the call in performance critical code. Leave PyEval_EvalFrame()
unchanged, this function is only kept for backward compatibility.
diff --git 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 = PyEval_EvalFrameEx(f, exc);
+    result = tstate->interp->eval_frame(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
@@ -4069,7 +4069,7 @@ _PyEval_EvalCodeWithName(PyObject *_co, PyObject *globals, PyObject *locals,
         return gen;
     }
 
-    retval = PyEval_EvalFrameEx(f,0);
+    retval = tstate->interp->eval_frame(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 = PyEval_EvalFrameEx(f,0);
+    result = tstate->interp->eval_frame(f,0);
 
     ++tstate->recursion_depth;
     Py_DECREF(f);

Original file line number	Diff line number	Diff line change
`@@ -4069,7 +4069,7 @@ _PyEval_EvalCodeWithName(PyObject _co, PyObject globals, PyObject *locals,`
`4069`	`4069`	`return gen;`
`4070`	`4070`	`}`
`4071`	`4071`
`4072`		`- retval = PyEval_EvalFrameEx(f,0);`
	`4072`	`+ retval = tstate->interp->eval_frame(f, 0);`
`4073`	`4073`
`4074`	`4074`	`fail: /* Jump here from prelude on failure */`
`4075`	`4075`
`@@ -4822,7 +4822,7 @@ _PyFunction_FastCall(PyCodeObject co, PyObject *args, Py_ssize_t nargs,`
`4822`	`4822`	`Py_INCREF(*args);`
`4823`	`4823`	`fastlocals[i] = *args++;`
`4824`	`4824`	`}`
`4825`		`- result = PyEval_EvalFrameEx(f,0);`
	`4825`	`+ result = tstate->interp->eval_frame(f,0);`
`4826`	`4826`
`4827`	`4827`	`++tstate->recursion_depth;`
`4828`	`4828`	`Py_DECREF(f);`