mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

My patch #597221. Use f_lasti more consistently.

This commit is contained in:
Michael W. Hudson 2002-08-20 15:19:14 +00:00
parent 4d5ef6aed6
commit 62897c5c13
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Python/ceval.c
View File

@ -599,12 +599,15 @@ eval_frame(PyFrameObject *f)
fastlocals = f->f_localsplus; fastlocals = f->f_localsplus;
freevars = f->f_localsplus + f->f_nlocals; freevars = f->f_localsplus + f->f_nlocals;
_PyCode_GETCODEPTR(co, &first_instr); _PyCode_GETCODEPTR(co, &first_instr);
if (f->f_lasti < 0) { /* An explanation is in order for the next line.
next_instr = first_instr;
} f->f_lasti now refers to the index of the last instruction
else { executed. You might think this was obvious from the name, but
next_instr = first_instr + f->f_lasti; this wasn't always true before 2.3! PyFrame_New now sets
} f->f_lasti to -1 (i.e. the index *before* the first instruction
and YIELD_VALUE doesn't fiddle with f_lasti any more. So this
does work. Promise. */
next_instr = first_instr + f->f_lasti + 1;
stack_pointer = f->f_stacktop; stack_pointer = f->f_stacktop;
assert(stack_pointer != NULL); assert(stack_pointer != NULL);
f->f_stacktop = NULL; /* remains NULL unless yield suspends frame */ f->f_stacktop = NULL; /* remains NULL unless yield suspends frame */
@ -1521,9 +1524,6 @@ eval_frame(PyFrameObject *f)
case YIELD_VALUE: case YIELD_VALUE:
retval = POP(); retval = POP();
f->f_stacktop = stack_pointer; f->f_stacktop = stack_pointer;
/* abuse the lasti field: here it points to
the *next* instruction */
f->f_lasti = INSTR_OFFSET();
why = WHY_YIELD; why = WHY_YIELD;
break; break;