From ee9f98d9f4b881ee15868a836a2b99271df1bc0e Mon Sep 17 00:00:00 2001 From: Mark Shannon Date: Tue, 5 Jan 2021 12:04:10 +0000 Subject: bpo-42823: Fix frame lineno when frame.f_trace is set (GH-24099) * Add test for frame.f_lineno with/without tracing. * Make sure that frame.f_lineno is correct regardless of whether frame.f_trace is set. * Update importlib * Add NEWS --- Python/compile.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Python/compile.c') diff --git a/Python/compile.c b/Python/compile.c index ddeb666322..cf5c639fea 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -6558,6 +6558,12 @@ ensure_exits_have_lineno(struct compiler *c) if (is_exit_without_lineno(entry)) { entry->b_instr[0].i_lineno = c->u->u_firstlineno; } + /* Eliminate empty blocks */ + for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) { + while (b->b_next && b->b_next->b_iused == 0) { + b->b_next = b->b_next->b_next; + } + } /* Any remaining reachable exit blocks without line number can only be reached by * fall through, and thus can only have a single predecessor */ for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) { -- cgit v1.2.1