[3.10] gh-101400: Fix incorrect lineno in exception message on continue/break which are not in a loop (GH-101413).

corona10 · corona10 · commit 17b038c4628a · 2023-01-31T12:35:34.000+09:00
(cherry picked from commit e867c1b) Co-authored-by: Dong-hee Na <donghee.na@python.org>
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
@@ -1410,9 +1410,6 @@ def error2():
             """
         self._check_error(source, "parameter and nonlocal", lineno=3)
 
-    def test_break_outside_loop(self):
-        self._check_error("break", "outside loop")
-
     def test_yield_outside_function(self):
         self._check_error("if 0: yield",                "outside function")
         self._check_error("if 0: yield\nelse:  x=1",    "outside function")
@@ -1441,20 +1438,27 @@ def test_return_outside_function(self):
                           "outside function")
 
     def test_break_outside_loop(self):
-        self._check_error("if 0: break",             "outside loop")
-        self._check_error("if 0: break\nelse:  x=1",  "outside loop")
-        self._check_error("if 1: pass\nelse: break", "outside loop")
-        self._check_error("class C:\n  if 0: break", "outside loop")
+        msg = "outside loop"
+        self._check_error("break", msg, lineno=1)
+        self._check_error("if 0: break", msg, lineno=1)
+        self._check_error("if 0: break\nelse:  x=1", msg, lineno=1)
+        self._check_error("if 1: pass\nelse: break", msg, lineno=2)
+        self._check_error("class C:\n  if 0: break", msg, lineno=2)
         self._check_error("class C:\n  if 1: pass\n  else: break",
-                          "outside loop")
+                          msg, lineno=3)
+        self._check_error("with object() as obj:\n break",
+                          msg, lineno=2)
 
     def test_continue_outside_loop(self):
-        self._check_error("if 0: continue",             "not properly in loop")
-        self._check_error("if 0: continue\nelse:  x=1", "not properly in loop")
-        self._check_error("if 1: pass\nelse: continue", "not properly in loop")
-        self._check_error("class C:\n  if 0: continue", "not properly in loop")
+        msg = "not properly in loop"
+        self._check_error("if 0: continue", msg, lineno=1)
+        self._check_error("if 0: continue\nelse:  x=1", msg, lineno=1)
+        self._check_error("if 1: pass\nelse: continue", msg, lineno=2)
+        self._check_error("class C:\n  if 0: continue", msg, lineno=2)
         self._check_error("class C:\n  if 1: pass\n  else: continue",
-                          "not properly in loop")
+                          msg, lineno=3)
+        self._check_error("with object() as obj:\n    continue",
+                          msg, lineno=2)
 
     def test_unexpected_indent(self):
         self._check_error("foo()\n bar()\n", "unexpected indent",
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-01-30-08-59-47.gh-issue-101400.Di_ZFm.rst b/Misc/NEWS.d/next/Core and Builtins/2023-01-30-08-59-47.gh-issue-101400.Di_ZFm.rst
@@ -0,0 +1,2 @@
+Fix wrong lineno in exception message on :keyword:`continue` or
+:keyword:`break` which are not in a loop. Patch by Dong-hee Na.
diff --git a/Python/compile.c b/Python/compile.c
@@ -3030,12 +3030,14 @@ static int
 compiler_break(struct compiler *c)
 {
     struct fblockinfo *loop = NULL;
+    int origin_loc = c->u->u_lineno;
     /* Emit instruction with line number */
     ADDOP(c, NOP);
     if (!compiler_unwind_fblock_stack(c, 0, &loop)) {
         return 0;
     }
     if (loop == NULL) {
+        c->u->u_lineno = origin_loc;
         return compiler_error(c, "'break' outside loop");
     }
     if (!compiler_unwind_fblock(c, loop, 0)) {
@@ -3050,12 +3052,14 @@ static int
 compiler_continue(struct compiler *c)
 {
     struct fblockinfo *loop = NULL;
+    int origin_loc = c->u->u_lineno;
     /* Emit instruction with line number */
     ADDOP(c, NOP);
     if (!compiler_unwind_fblock_stack(c, 0, &loop)) {
         return 0;
     }
     if (loop == NULL) {
+        c->u->u_lineno = origin_loc;
         return compiler_error(c, "'continue' not properly in loop");
     }
     ADDOP_JUMP(c, JUMP_ABSOLUTE, loop->fb_block);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix wrong lineno in exception message on :keyword:`continue` or
	`2`	+:keyword:`break` which are not in a loop. Patch by Dong-hee Na.
Original file line number	Diff line number	Diff line change
`@@ -3030,12 +3030,14 @@ static int`
`3030`	`3030`	`compiler_break(struct compiler *c)`
`3031`	`3031`	`{`
`3032`	`3032`	`struct fblockinfo *loop = NULL;`
	`3033`	`+ int origin_loc = c->u->u_lineno;`
`3033`	`3034`	`/* Emit instruction with line number */`
`3034`	`3035`	`ADDOP(c, NOP);`
`3035`	`3036`	`if (!compiler_unwind_fblock_stack(c, 0, &loop)) {`
`3036`	`3037`	`return 0;`
`3037`	`3038`	`}`
`3038`	`3039`	`if (loop == NULL) {`
	`3040`	`+ c->u->u_lineno = origin_loc;`
`3039`	`3041`	`return compiler_error(c, "'break' outside loop");`
`3040`	`3042`	`}`
`3041`	`3043`	`if (!compiler_unwind_fblock(c, loop, 0)) {`
`@@ -3050,12 +3052,14 @@ static int`
`3050`	`3052`	`compiler_continue(struct compiler *c)`
`3051`	`3053`	`{`
`3052`	`3054`	`struct fblockinfo *loop = NULL;`
	`3055`	`+ int origin_loc = c->u->u_lineno;`
`3053`	`3056`	`/* Emit instruction with line number */`
`3054`	`3057`	`ADDOP(c, NOP);`
`3055`	`3058`	`if (!compiler_unwind_fblock_stack(c, 0, &loop)) {`
`3056`	`3059`	`return 0;`
`3057`	`3060`	`}`
`3058`	`3061`	`if (loop == NULL) {`
	`3062`	`+ c->u->u_lineno = origin_loc;`
`3059`	`3063`	`return compiler_error(c, "'continue' not properly in loop");`
`3060`	`3064`	`}`
`3061`	`3065`	`ADDOP_JUMP(c, JUMP_ABSOLUTE, loop->fb_block);`