traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix broken merge

This commit is contained in:
Richard Jones 2006-05-23 18:32:11 +00:00
parent cebbefc98d
commit a372711fcc
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Objects/frameobject.c
View File

@ -362,8 +362,7 @@ static PyGetSetDef frame_getsetlist[] = {
In zombie mode, no field of PyFrameObject holds a reference, but In zombie mode, no field of PyFrameObject holds a reference, but
the following fields are still valid: the following fields are still valid:
* ob_type, ob_size, f_code, f_valuestack, * ob_type, ob_size, f_code, f_valuestack;
f_nlocals, f_ncells, f_nfreevars, f_stacksize;
* f_locals, f_trace, * f_locals, f_trace,
f_exc_type, f_exc_value, f_exc_traceback are NULL; f_exc_type, f_exc_value, f_exc_traceback are NULL;
@ -629,11 +628,7 @@ PyFrame_New(PyThreadState *tstate, PyCodeObject *code, PyObject *globals,
} }
f->f_code = code; f->f_code = code;
f->f_nlocals = code->co_nlocals; extras = code->co_nlocals + ncells + nfrees;
f->f_stacksize = code->co_stacksize;
f->f_ncells = ncells;
f->f_nfreevars = nfrees;
extras = f->f_nlocals + ncells + nfrees;
f->f_valuestack = f->f_localsplus + extras; f->f_valuestack = f->f_localsplus + extras;
for (i=0; i<extras; i++) for (i=0; i<extras; i++)
f->f_localsplus[i] = NULL; f->f_localsplus[i] = NULL;