Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f180b31

Browse files
markshannonmarkshannon
authored
GH-118095: Handle RETURN_GENERATOR in tier 2 (GH-118180)
1 parent 10bb90e commit f180b31

16 files changed

Lines changed: 143 additions & 81 deletions

‎Include/internal/pycore_ceval.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ static inline void _Py_LeaveRecursiveCall(void) {
182182

183183
extern struct _PyInterpreterFrame* _PyEval_GetFrame(void);
184184

185-
extern PyObject* _Py_MakeCoro(PyFunctionObject *func);
185+
PyAPI_FUNC(PyObject *)_Py_MakeCoro(PyFunctionObject *func);
186186

187187
/* Handle signals, pending calls, GIL drop request
188188
and asynchronous exception */

‎Include/internal/pycore_frame.h‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,17 @@ _PyFrame_NumSlotsForCodeObject(PyCodeObject *code)
110110
return code->co_framesize - FRAME_SPECIALS_SIZE;
111111
}
112112

113-
void _PyFrame_Copy(_PyInterpreterFrame *src, _PyInterpreterFrame *dest);
113+
static inline void _PyFrame_Copy(_PyInterpreterFrame *src, _PyInterpreterFrame *dest)
114+
{
115+
assert(src->stacktop >= _PyFrame_GetCode(src)->co_nlocalsplus);
116+
*dest = *src;
117+
for (int i = 1; i < src->stacktop; i++) {
118+
dest->localsplus[i] = src->localsplus[i];
119+
}
120+
// Don't leave a dangling pointer to the old frame when creating generators
121+
// and coroutines:
122+
dest->previous = NULL;
123+
}
114124

115125
/* Consumes reference to func and locals.
116126
Does not initialize frame->previous, which happens
@@ -256,7 +266,7 @@ _PyThreadState_HasStackSpace(PyThreadState *tstate, int size)
256266
extern _PyInterpreterFrame *
257267
_PyThreadState_PushFrame(PyThreadState *tstate, size_t size);
258268

259-
void _PyThreadState_PopFrame(PyThreadState *tstate, _PyInterpreterFrame *frame);
269+
PyAPI_FUNC(void) _PyThreadState_PopFrame(PyThreadState *tstate, _PyInterpreterFrame *frame);
260270

261271
/* Pushes a frame without checking for space.
262272
* Must be guarded by _PyThreadState_HasStackSpace()

‎Include/internal/pycore_opcode_metadata.h‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Include/internal/pycore_uop_ids.h‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Include/internal/pycore_uop_metadata.h‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Lib/test/test_capi/test_opt.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,5 +1286,17 @@ def testfunc(n):
12861286
self.assertEqual(res, 32 * 32)
12871287
self.assertIsNone(ex)
12881288

1289+
def test_return_generator(self):
1290+
def gen():
1291+
yield None
1292+
def testfunc(n):
1293+
for i in range(n):
1294+
gen()
1295+
return i
1296+
res, ex = self._run_with_optimizer(testfunc, 20)
1297+
self.assertEqual(res, 19)
1298+
self.assertIsNotNone(ex)
1299+
self.assertIn("_RETURN_GENERATOR", get_opnames(ex))
1300+
12891301
if __name__ == "__main__":
12901302
unittest.main()

‎Objects/frameobject.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,6 @@ mark_stacks(PyCodeObject *code_obj, int len)
304304
stacks[i] = UNINITIALIZED;
305305
}
306306
stacks[0] = EMPTY_STACK;
307-
if (code_obj->co_flags & (CO_GENERATOR | CO_COROUTINE | CO_ASYNC_GENERATOR))
308-
{
309-
// Generators get sent None while starting:
310-
stacks[0] = push_value(stacks[0], Object);
311-
}
312307
int todo = 1;
313308
while (todo) {
314309
todo = 0;

‎Python/bytecodes.c‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -837,12 +837,7 @@ dummy_func(
837837
_PyFrame_StackPush(frame, retval);
838838
LOAD_SP();
839839
LOAD_IP(frame->return_offset);
840-
#if LLTRACE && TIER_ONE
841-
lltrace = maybe_lltrace_resume_frame(frame, &entry_frame, GLOBALS());
842-
if (lltrace < 0) {
843-
goto exit_unwind;
844-
}
845-
#endif
840+
LLTRACE_RESUME_FRAME();
846841
}
847842

848843
macro(RETURN_VALUE) =
@@ -3186,12 +3181,7 @@ dummy_func(
31863181
tstate->py_recursion_remaining--;
31873182
LOAD_SP();
31883183
LOAD_IP(0);
3189-
#if LLTRACE && TIER_ONE
3190-
lltrace = maybe_lltrace_resume_frame(frame, &entry_frame, GLOBALS());
3191-
if (lltrace < 0) {
3192-
goto exit_unwind;
3193-
}
3194-
#endif
3184+
LLTRACE_RESUME_FRAME();
31953185
}
31963186

31973187
macro(CALL_BOUND_METHOD_EXACT_ARGS) =
@@ -3877,7 +3867,7 @@ dummy_func(
38773867
}
38783868
}
38793869

3880-
tier1 inst(RETURN_GENERATOR, (--)) {
3870+
inst(RETURN_GENERATOR, (-- res)) {
38813871
assert(PyFunction_Check(frame->f_funcobj));
38823872
PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
38833873
PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -3887,19 +3877,19 @@ dummy_func(
38873877
assert(EMPTY());
38883878
_PyFrame_SetStackPointer(frame, stack_pointer);
38893879
_PyInterpreterFrame *gen_frame = (_PyInterpreterFrame *)gen->gi_iframe;
3890-
frame->instr_ptr = next_instr;
3880+
frame->instr_ptr++;
38913881
_PyFrame_Copy(frame, gen_frame);
38923882
assert(frame->frame_obj == NULL);
38933883
gen->gi_frame_state = FRAME_CREATED;
38943884
gen_frame->owner = FRAME_OWNED_BY_GENERATOR;
38953885
_Py_LeaveRecursiveCallPy(tstate);
3896-
assert(frame != &entry_frame);
3886+
res = (PyObject *)gen;
38973887
_PyInterpreterFrame *prev = frame->previous;
38983888
_PyThreadState_PopFrame(tstate, frame);
38993889
frame = tstate->current_frame = prev;
3900-
_PyFrame_StackPush(frame, (PyObject *)gen);
39013890
LOAD_IP(frame->return_offset);
3902-
goto resume_frame;
3891+
LOAD_SP();
3892+
LLTRACE_RESUME_FRAME();
39033893
}
39043894

39053895
inst(BUILD_SLICE, (start, stop, step if (oparg == 3) -- slice)) {

‎Python/ceval_macros.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,18 @@
8686
#define PRE_DISPATCH_GOTO() ((void)0)
8787
#endif
8888

89+
#if LLTRACE
90+
#define LLTRACE_RESUME_FRAME() \
91+
do { \
92+
lltrace = maybe_lltrace_resume_frame(frame, &entry_frame, GLOBALS()); \
93+
if (lltrace < 0) { \
94+
goto exit_unwind; \
95+
} \
96+
} while (0)
97+
#else
98+
#define LLTRACE_RESUME_FRAME() ((void)0)
99+
#endif
100+
89101
#ifdef Py_GIL_DISABLED
90102
#define QSBR_QUIESCENT_STATE(tstate) _Py_qsbr_quiescent_state(((_PyThreadStateImpl *)tstate)->qsbr)
91103
#else

‎Python/executor_cases.c.h‎

Lines changed: 31 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)