diff options
| author | Mark Shannon <mark@hotpy.org> | 2021-05-21 09:57:35 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 09:57:35 (GMT) |
| commit | b11a951f16f0603d98de24fee5c023df83ea552c (patch) | |
| tree | 82e7807515db0e284d9ebc3b8c3ba6ff08699ea5 /Objects/genobject.c | |
| parent | be4dd7fcd93ed29d362c4bbcc48151bc619d6595 (diff) | |
| download | cpython-b11a951f16f0603d98de24fee5c023df83ea552c.zip cpython-b11a951f16f0603d98de24fee5c023df83ea552c.tar.gz cpython-b11a951f16f0603d98de24fee5c023df83ea552c.tar.bz2 | |
bpo-44032: Move data stack to thread from FrameObject. (GH-26076)
* Remove 'zombie' frames. We won't need them once we are allocating fixed-size frames.
* Add co_nlocalplus field to code object to avoid recomputing size of locals + frees + cells.
* Move locals, cells and freevars out of frame object into separate memory buffer.
* Use per-threadstate allocated memory chunks for local variables.
* Move globals and builtins from frame object to per-thread stack.
* Move (slow) locals frame object to per-thread stack.
* Move internal frame functions to internal header.
Diffstat (limited to 'Objects/genobject.c')
| -rw-r--r-- | Objects/genobject.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Objects/genobject.c b/Objects/genobject.c index 1889df1..db00d19 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -176,7 +176,7 @@ gen_send_ex2(PyGenObject *gen, PyObject *arg, PyObject **presult, } assert(_PyFrame_IsRunnable(f)); - assert(f->f_lasti >= 0 || ((unsigned char *)PyBytes_AS_STRING(f->f_code->co_code))[0] == GEN_START); + assert(f->f_lasti >= 0 || ((unsigned char *)PyBytes_AS_STRING(gen->gi_code->co_code))[0] == GEN_START); /* Push arg onto the frame's value stack */ result = arg ? arg : Py_None; Py_INCREF(result); @@ -331,7 +331,7 @@ _PyGen_yf(PyGenObject *gen) PyFrameObject *f = gen->gi_frame; if (f) { - PyObject *bytecode = f->f_code->co_code; + PyObject *bytecode = gen->gi_code->co_code; unsigned char *code = (unsigned char *)PyBytes_AS_STRING(bytecode); if (f->f_lasti < 0) { @@ -826,8 +826,7 @@ gen_new_with_qualname(PyTypeObject *type, PyFrameObject *f, } gen->gi_frame = f; f->f_gen = (PyObject *) gen; - Py_INCREF(f->f_code); - gen->gi_code = (PyObject *)(f->f_code); + gen->gi_code = PyFrame_GetCode(f); gen->gi_weakreflist = NULL; gen->gi_exc_state.exc_type = NULL; gen->gi_exc_state.exc_value = NULL; @@ -836,7 +835,7 @@ gen_new_with_qualname(PyTypeObject *type, PyFrameObject *f, if (name != NULL) gen->gi_name = name; else - gen->gi_name = ((PyCodeObject *)gen->gi_code)->co_name; + gen->gi_name = gen->gi_code->co_name; Py_INCREF(gen->gi_name); if (qualname != NULL) gen->gi_qualname = qualname; @@ -1167,11 +1166,12 @@ compute_cr_origin(int origin_depth) } frame = PyEval_GetFrame(); for (int i = 0; i < frame_count; ++i) { - PyCodeObject *code = frame->f_code; + PyCodeObject *code = PyFrame_GetCode(frame); PyObject *frameinfo = Py_BuildValue("OiO", code->co_filename, PyFrame_GetLineNumber(frame), code->co_name); + Py_DECREF(code); if (!frameinfo) { Py_DECREF(cr_origin); return NULL; |