Stackless issue python#133: fix Python/ceval.c

Anselm Kruis · Anselm Kruis · commit 040c4f2d1d1a · 2017-10-25T23:12:22.000+02:00
The previous merge broke Python/ceval.c.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -797,18 +797,18 @@ PyEval_EvalFrame(PyFrameObject *f) {
 }
 
 PyObject *
-#ifdef STACKLESS
-slp_eval_frame_value(PyFrameObject *f, int throwflag, PyObject *retval)
-#else
 PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
-#endif
 {
     PyThreadState *tstate = PyThreadState_GET();
     return tstate->interp->eval_frame(f, throwflag);
 }
 
 PyObject *
+#ifdef STACKLESS
+slp_eval_frame_value(PyFrameObject *f, int throwflag, PyObject *retval)
+#else
 _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
+#endif
 {
 #ifdef DXPAIRS
     int lastopcode = 0;
@@ -4006,7 +4006,7 @@ slp_eval_frame_with_cleanup(PyFrameObject *f, int throwflag, PyObject *retval)
 }
 
 PyObject *
-PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
+_PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
 {
     return PyEval_EvalFrameEx_slp(f, throwflag, NULL);
 }

Original file line number	Diff line number	Diff line change
`@@ -797,18 +797,18 @@ PyEval_EvalFrame(PyFrameObject *f) {`
`797`	`797`	`}`
`798`	`798`
`799`	`799`	`PyObject *`
`800`		`-#ifdef STACKLESS`
`801`		`-slp_eval_frame_value(PyFrameObject f, int throwflag, PyObject retval)`
`802`		`-#else`
`803`	`800`	`PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
`804`		`-#endif`
`805`	`801`	`{`
`806`	`802`	`PyThreadState *tstate = PyThreadState_GET();`
`807`	`803`	`return tstate->interp->eval_frame(f, throwflag);`
`808`	`804`	`}`
`809`	`805`
`810`	`806`	`PyObject *`
	`807`	`+#ifdef STACKLESS`
	`808`	`+slp_eval_frame_value(PyFrameObject f, int throwflag, PyObject retval)`
	`809`	`+#else`
`811`	`810`	`_PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)`
	`811`	`+#endif`
`812`	`812`	`{`
`813`	`813`	`#ifdef DXPAIRS`
`814`	`814`	`int lastopcode = 0;`
`@@ -4006,7 +4006,7 @@ slp_eval_frame_with_cleanup(PyFrameObject f, int throwflag, PyObject retval)`
`4006`	`4006`	`}`
`4007`	`4007`
`4008`	`4008`	`PyObject *`
`4009`		`-PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
	`4009`	`+_PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)`
`4010`	`4010`	`{`
`4011`	`4011`	`return PyEval_EvalFrameEx_slp(f, throwflag, NULL);`
`4012`	`4012`	`}`