bpo-42645: Make sure that return/break/continue are only traced once when exiting via a finally block. (GH-23780)

* Make sure that return/break/continue are only traced once when exiting via a finally block.

* Add test for return in try-finally.

* Update importlib
This commit is contained in:
Mark Shannon 2020-12-16 13:07:01 +00:00 committed by GitHub
parent c71581c7a4
commit 5274b682bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1791 additions and 1677 deletions

View File

@ -366,16 +366,12 @@ dis_tryfinally = """\
%3d 6 LOAD_FAST 1 (b) %3d 6 LOAD_FAST 1 (b)
8 CALL_FUNCTION 0 8 CALL_FUNCTION 0
10 POP_TOP 10 POP_TOP
12 RETURN_VALUE
%3d 12 RETURN_VALUE >> 14 LOAD_FAST 1 (b)
%3d >> 14 LOAD_FAST 1 (b)
16 CALL_FUNCTION 0 16 CALL_FUNCTION 0
18 POP_TOP 18 POP_TOP
20 RERAISE 20 RERAISE
""" % (_tryfinally.__code__.co_firstlineno + 1, """ % (_tryfinally.__code__.co_firstlineno + 1,
_tryfinally.__code__.co_firstlineno + 2,
_tryfinally.__code__.co_firstlineno + 4,
_tryfinally.__code__.co_firstlineno + 2, _tryfinally.__code__.co_firstlineno + 2,
_tryfinally.__code__.co_firstlineno + 4, _tryfinally.__code__.co_firstlineno + 4,
) )
@ -388,17 +384,13 @@ dis_tryfinallyconst = """\
%3d 4 LOAD_FAST 0 (b) %3d 4 LOAD_FAST 0 (b)
6 CALL_FUNCTION 0 6 CALL_FUNCTION 0
8 POP_TOP 8 POP_TOP
10 LOAD_CONST 1 (1)
%3d 10 LOAD_CONST 1 (1)
12 RETURN_VALUE 12 RETURN_VALUE
>> 14 LOAD_FAST 0 (b)
%3d >> 14 LOAD_FAST 0 (b)
16 CALL_FUNCTION 0 16 CALL_FUNCTION 0
18 POP_TOP 18 POP_TOP
20 RERAISE 20 RERAISE
""" % (_tryfinallyconst.__code__.co_firstlineno + 1, """ % (_tryfinallyconst.__code__.co_firstlineno + 1,
_tryfinallyconst.__code__.co_firstlineno + 2,
_tryfinallyconst.__code__.co_firstlineno + 4,
_tryfinallyconst.__code__.co_firstlineno + 2, _tryfinallyconst.__code__.co_firstlineno + 2,
_tryfinallyconst.__code__.co_firstlineno + 4, _tryfinallyconst.__code__.co_firstlineno + 4,
) )

View File

@ -678,6 +678,119 @@ class TraceTestCase(unittest.TestCase):
(4, 'line'), (4, 'line'),
(4, 'return')]) (4, 'return')])
def test_if_break(self):
def func():
seq = [1, 0]
while seq:
n = seq.pop()
if n:
break # line 5
else:
n = 99
return n # line 8
self.run_and_compare(func,
[(0, 'call'),
(1, 'line'),
(2, 'line'),
(3, 'line'),
(4, 'line'),
(2, 'line'),
(3, 'line'),
(4, 'line'),
(5, 'line'),
(8, 'line'),
(8, 'return')])
def test_break_through_finally(self):
def func():
a, c, d, i = 1, 1, 1, 99
try:
for i in range(3):
try:
a = 5
if i > 0:
break # line 7
a = 8
finally:
c = 10
except:
d = 12 # line 12
assert a == 5 and c == 10 and d == 1 # line 13
self.run_and_compare(func,
[(0, 'call'),
(1, 'line'),
(2, 'line'),
(3, 'line'),
(4, 'line'),
(5, 'line'),
(6, 'line'),
(8, 'line'),
(10, 'line'),
(3, 'line'),
(4, 'line'),
(5, 'line'),
(6, 'line'),
(7, 'line'),
(10, 'line'),
(13, 'line'),
(13, 'return')])
def test_continue_through_finally(self):
def func():
a, b, c, d, i = 1, 1, 1, 1, 99
try:
for i in range(2):
try:
a = 5
if i > 0:
continue # line 7
b = 8
finally:
c = 10
except:
d = 12 # line 12
assert (a, b, c, d) == (5, 8, 10, 1) # line 13
self.run_and_compare(func,
[(0, 'call'),
(1, 'line'),
(2, 'line'),
(3, 'line'),
(4, 'line'),
(5, 'line'),
(6, 'line'),
(8, 'line'),
(10, 'line'),
(3, 'line'),
(4, 'line'),
(5, 'line'),
(6, 'line'),
(7, 'line'),
(10, 'line'),
(3, 'line'),
(13, 'line'),
(13, 'return')])
def test_return_through_finally(self):
def func():
try:
return 2
finally:
4
self.run_and_compare(func,
[(0, 'call'),
(1, 'line'),
(2, 'line'),
(4, 'line'),
(4, 'return')])
class SkipLineEventsTraceTestCase(TraceTestCase): class SkipLineEventsTraceTestCase(TraceTestCase):
"""Repeat the trace tests, but with per-line events skipped""" """Repeat the trace tests, but with per-line events skipped"""

View File

@ -1695,19 +1695,22 @@ compiler_unwind_fblock(struct compiler *c, struct fblockinfo *info,
return 1; return 1;
case FINALLY_TRY: case FINALLY_TRY:
/* This POP_BLOCK gets the line number of the unwinding statement */
ADDOP(c, POP_BLOCK); ADDOP(c, POP_BLOCK);
if (preserve_tos) { if (preserve_tos) {
if (!compiler_push_fblock(c, POP_VALUE, NULL, NULL, NULL)) { if (!compiler_push_fblock(c, POP_VALUE, NULL, NULL, NULL)) {
return 0; return 0;
} }
} }
/* Emit the finally block, restoring the line number when done */ /* Emit the finally block */
int saved_lineno = c->u->u_lineno;
VISIT_SEQ(c, stmt, info->fb_datum); VISIT_SEQ(c, stmt, info->fb_datum);
c->u->u_lineno = saved_lineno;
if (preserve_tos) { if (preserve_tos) {
compiler_pop_fblock(c, POP_VALUE, NULL); compiler_pop_fblock(c, POP_VALUE, NULL);
} }
/* The finally block should appear to execute after the
* statement causing the unwinding, so make the unwinding
* instruction artificial */
c->u->u_lineno = -1;
return 1; return 1;
case FINALLY_END: case FINALLY_END:
@ -2859,6 +2862,12 @@ compiler_return(struct compiler *c, stmt_ty s)
} }
if (preserve_tos) { if (preserve_tos) {
VISIT(c, expr, s->v.Return.value); VISIT(c, expr, s->v.Return.value);
} else {
/* Emit instruction with line number for expression */
if (s->v.Return.value != NULL) {
SET_LOC(c, s->v.Return.value);
ADDOP(c, NOP);
}
} }
if (!compiler_unwind_fblock_stack(c, preserve_tos, NULL)) if (!compiler_unwind_fblock_stack(c, preserve_tos, NULL))
return 0; return 0;
@ -2866,7 +2875,7 @@ compiler_return(struct compiler *c, stmt_ty s)
ADDOP_LOAD_CONST(c, Py_None); ADDOP_LOAD_CONST(c, Py_None);
} }
else if (!preserve_tos) { else if (!preserve_tos) {
VISIT(c, expr, s->v.Return.value); ADDOP_LOAD_CONST(c, s->v.Return.value->v.Constant.value);
} }
ADDOP(c, RETURN_VALUE); ADDOP(c, RETURN_VALUE);
NEXT_BLOCK(c); NEXT_BLOCK(c);

3322
Python/importlib.h generated

File diff suppressed because it is too large Load Diff