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

GH-96793: Change FOR_ITER to not pop the iterator on exhaustion. (GH-96801)

Browse source 
Change FOR_ITER to have the same stack effect regardless of whether it branches or not.
Performance is unchanged as FOR_ITER (and specialized forms jump over the cleanup code).
This commit is contained in:
Mark Shannon 2022-10-27 03:55:03 -07:00 • committed by GitHub
parent e60892f9db
commit 22863df7ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 277 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Python/compile.c
View file

@ -1042,6 +1042,8 @@ stack_effect(int opcode, int oparg, int jump)
return -1;
case SWAP:
return 0;
case END_FOR:
return -2;
/* Unary operators */
case UNARY_POSITIVE:
@ -1098,8 +1100,7 @@ stack_effect(int opcode, int oparg, int jump)
case UNPACK_EX:
return (oparg&0xFF) + (oparg>>8);
case FOR_ITER:
/* -1 at end of iterator, 1 if continue iterating. */
return jump > 0 ? -1 : 1;
return 1;
case SEND:
return jump > 0 ? -1 : 0;
case STORE_ATTR:
@ -3103,6 +3104,7 @@ compiler_for(struct compiler *c, stmt_ty s)
ADDOP_JUMP(c, NO_LOCATION, JUMP, start);
USE_LABEL(c, cleanup);
ADDOP(c, NO_LOCATION, END_FOR);
compiler_pop_fblock(c, FOR_LOOP, start);
@ -5315,6 +5317,7 @@ compiler_sync_comprehension_generator(struct compiler *c, location loc,
ADDOP_JUMP(c, elt_loc, JUMP, start);
USE_LABEL(c, anchor);
ADDOP(c, NO_LOCATION, END_FOR);
}
return 1;