From 01601aa7360ae51e74a64dbe957288096bb364fd Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sun, 25 Jul 2021 17:04:06 -0700 Subject: [3.10] bpo-44600: Fix line numbers for pattern matching cleanup code (GH-27346) (GH-27356) (cherry picked from commit 4214f470f0cb9b6fef9a90758756fbc00ba95b5a) Co-authored-by: Charles Burkland Automerge-Triggered-By: GH:brandtbucher --- Python/compile.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Python') diff --git a/Python/compile.c b/Python/compile.c index 46660f243a..de2a6bf296 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -6398,17 +6398,25 @@ compiler_match_inner(struct compiler *c, stmt_ty s, pattern_context *pc) } VISIT_SEQ(c, stmt, m->body); ADDOP_JUMP(c, JUMP_FORWARD, end); + // If the pattern fails to match, we want the line number of the + // cleanup to be associated with the failed pattern, not the last line + // of the body + SET_LOC(c, m->pattern); RETURN_IF_FALSE(emit_and_reset_fail_pop(c, pc)); } if (has_default) { - if (cases == 1) { - // No matches. Done with the subject: - ADDOP(c, POP_TOP); - } // A trailing "case _" is common, and lets us save a bit of redundant // pushing and popping in the loop above: m = asdl_seq_GET(s->v.Match.cases, cases - 1); SET_LOC(c, m->pattern); + if (cases == 1) { + // No matches. Done with the subject: + ADDOP(c, POP_TOP); + } + else { + // Show line coverage for default case (it doesn't create bytecode) + ADDOP(c, NOP); + } if (m->guard) { RETURN_IF_FALSE(compiler_jump_if(c, m->guard, end, 0)); } -- cgit v1.2.1