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

gh-101169: reduce the implementation of except* by one bytecode instruction (#101170)

Browse source
This commit is contained in:
Irit Katriel 2023-01-19 23:30:49 +00:00 • committed by GitHub
parent 6036c3e856
commit 9ec9b203ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Python/compile.c
View file

@ -3586,16 +3586,15 @@ compiler_try_except(struct compiler *c, stmt_ty s)
[] POP_BLOCK
[] JUMP L0
[exc] L1: COPY 1 ) save copy of the original exception
[orig, exc] BUILD_LIST ) list for raised/reraised excs ("result")
[orig, exc, res] SWAP 2
[exc] L1: BUILD_LIST ) list for raised/reraised excs ("result")
[orig, res] COPY 2 ) make a copy of the original EG
[orig, res, exc] <evaluate E1>
[orig, res, exc, E1] CHECK_EG_MATCH
[orig, red, rest/exc, match?] COPY 1
[orig, red, rest/exc, match?, match?] POP_JUMP_IF_NOT_NONE H1
[orig, red, exc, None] POP_TOP
[orig, red, exc] JUMP L2
[orig, res, rest/exc, match?] COPY 1
[orig, res, rest/exc, match?, match?] POP_JUMP_IF_NOT_NONE H1
[orig, res, exc, None] POP_TOP
[orig, res, exc] JUMP L2
[orig, res, rest, match] H1: <assign to V1> (or POP if no V1)
@ -3664,21 +3663,17 @@ compiler_try_star_except(struct compiler *c, stmt_ty s)
except = next_except;
NEW_JUMP_TARGET_LABEL(c, handle_match);
if (i == 0) {
/* Push the original EG into the stack */
/*
[exc] COPY 1
[orig, exc]
*/
ADDOP_I(c, loc, COPY, 1);
/* create empty list for exceptions raised/reraise in the except* blocks */
/*
[orig, exc] BUILD_LIST
[orig, exc, []] SWAP 2
[orig] BUILD_LIST
*/
/* Creat a copy of the original EG */
/*
[orig, []] COPY 2
[orig, [], exc]
*/
ADDOP_I(c, loc, BUILD_LIST, 0);
ADDOP_I(c, loc, SWAP, 2);
ADDOP_I(c, loc, COPY, 2);
}
if (handler->v.ExceptHandler.type) {
VISIT(c, expr, handler->v.ExceptHandler.type);