Mark POP_TOP at end of expression statement as artificial, to conform to PEP 626. (GH-24860)

markshannon · web-flow · commit c5440937efab · 2021-03-15T14:24:25.000Z
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
@@ -786,6 +786,14 @@ def or_false(x):
                 self.assertIn('LOAD_', opcodes[0].opname)
                 self.assertEqual('RETURN_VALUE', opcodes[1].opname)
 
+    def test_lineno_procedure_call(self):
+        def call():
+            (
+                print()
+            )
+        line1 = call.__code__.co_firstlineno + 1
+        assert line1 not in [line for (_, _, line) in call.__code__.co_lines()]
+
     def test_lineno_after_implicit_return(self):
         TRUE = True
         # Don't use constant True or False, as compiler will remove test
diff --git a/Python/compile.c b/Python/compile.c
@@ -3397,6 +3397,8 @@ compiler_visit_stmt_expr(struct compiler *c, expr_ty value)
     }
 
     VISIT(c, expr, value);
+    /* Mark POP_TOP as artificial */
+    c->u->u_lineno = -1;
     ADDOP(c, POP_TOP);
     return 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -3397,6 +3397,8 @@ compiler_visit_stmt_expr(struct compiler *c, expr_ty value)`
`3397`	`3397`	`}`
`3398`	`3398`
`3399`	`3399`	`VISIT(c, expr, value);`
	`3400`	`+ /* Mark POP_TOP as artificial */`
	`3401`	`+ c->u->u_lineno = -1;`
`3400`	`3402`	`ADDOP(c, POP_TOP);`
`3401`	`3403`	`return 1;`
`3402`	`3404`	`}`