mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

PyFrameObject: rename f_stackbottom to f_stacktop, since it points to

Browse source 
the next free valuestack slot, not to the base (in America, stacks push
and pop at the top -- they mutate at the bottom in Australia <winK>).
eval_frame():  assert that f_stacktop isn't NULL upon entry.
frame_delloc():  avoid ordered pointer comparisons involving f_stacktop
when f_stacktop is NULL.
This commit is contained in:
Tim Peters 2001-06-23 05:26:56 +00:00
parent f5eae668a8
commit 8c96369513
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Python/ceval.c
View file

@ -147,9 +147,8 @@ gen_iternext(genobject *gen)
"generator already executing");
return NULL;
}
if (f->f_stackbottom == NULL) {
if (f->f_stacktop == NULL)
return NULL;
}
/* Generators always return to their most recent caller, not
* necessarily their creator. */
@ -584,8 +583,9 @@ eval_frame(PyFrameObject *f)
freevars = f->f_localsplus + f->f_nlocals;
_PyCode_GETCODEPTR(co, &first_instr);
next_instr = first_instr + f->f_lasti;
stack_pointer = f->f_stackbottom;
f->f_stackbottom = NULL;
stack_pointer = f->f_stacktop;
assert(stack_pointer != NULL);
f->f_stacktop = NULL;
#ifdef LLTRACE
lltrace = PyDict_GetItemString(f->f_globals,"__lltrace__") != NULL;
@ -1371,7 +1371,7 @@ eval_frame(PyFrameObject *f)
case YIELD_VALUE:
retval = POP();
f->f_stackbottom = stack_pointer;
f->f_stacktop = stack_pointer;
f->f_lasti = INSTR_OFFSET();
why = WHY_YIELD;
break;