[3.13] gh-123048: Fix missing source location in pattern matching code (GH-123167) (#123169)

miss-islington · iritkatriel · web-flow · commit 159db050f429 · 2024-08-20T11:13:43.000Z
gh-123048: Fix missing source location in pattern matching code (GH-123167) (cherry picked from commit bffed80) Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
diff --git a/Lib/test/test_patma.py b/Lib/test/test_patma.py
@@ -1,6 +1,7 @@
 import array
 import collections
 import dataclasses
+import dis
 import enum
 import inspect
 import sys
@@ -3377,6 +3378,24 @@ class Keys:
         self.assertIs(y, None)
         self.assertIs(z, None)
 
+class TestSourceLocations(unittest.TestCase):
+    def test_jump_threading(self):
+        # See gh-123048
+        def f():
+            x = 0
+            v = 1
+            match v:
+                case 1:
+                    if x < 0:
+                        x = 1
+                case 2:
+                    if x < 0:
+                        x = 1
+            x += 1
+
+        for inst in dis.get_instructions(f):
+            if inst.opcode in dis.hasjump:
+                self.assertIsNotNone(inst.positions.lineno, "jump without location")
 
 class TestTracing(unittest.TestCase):
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-08-20-11-09-16.gh-issue-123048.2TISpv.rst b/Misc/NEWS.d/next/Core and Builtins/2024-08-20-11-09-16.gh-issue-123048.2TISpv.rst
@@ -0,0 +1,2 @@
+Fix a bug where pattern matching code could emit a :opcode:`JUMP_FORWARD`
+with no source location.
diff --git a/Python/compile.c b/Python/compile.c
@@ -7478,7 +7478,7 @@ compiler_match_inner(struct compiler *c, stmt_ty s, pattern_context *pc)
             ADDOP(c, LOC(m->pattern), POP_TOP);
         }
         VISIT_SEQ(c, stmt, m->body);
-        ADDOP_JUMP(c, NO_LOCATION, JUMP_NO_INTERRUPT, end);
+        ADDOP_JUMP(c, NO_LOCATION, JUMP, 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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix a bug where pattern matching code could emit a :opcode:`JUMP_FORWARD`
	`2`	`+with no source location.`
Original file line number	Diff line number	Diff line change
`@@ -7478,7 +7478,7 @@ compiler_match_inner(struct compiler c, stmt_ty s, pattern_context pc)`
`7478`	`7478`	`ADDOP(c, LOC(m->pattern), POP_TOP);`
`7479`	`7479`	`}`
`7480`	`7480`	`VISIT_SEQ(c, stmt, m->body);`
`7481`		`- ADDOP_JUMP(c, NO_LOCATION, JUMP_NO_INTERRUPT, end);`
	`7481`	`+ ADDOP_JUMP(c, NO_LOCATION, JUMP, end);`
`7482`	`7482`	`// If the pattern fails to match, we want the line number of the`
`7483`	`7483`	`// cleanup to be associated with the failed pattern, not the last line`
`7484`	`7484`	`// of the body`