Mark instructions at end of class scope as artificial. (GH-24222)

markshannon · web-flow · commit e56d54e44769 · 2021-01-15T13:52:00.000Z
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
@@ -956,6 +956,24 @@ def func():
              (2, 'line'),
              (2, 'return')])
 
+    def test_implicit_return_in_class(self):
+
+        def func():
+            class A:
+                if 3 < 9:
+                    a = 1
+                else:
+                    a = 2
+
+        self.run_and_compare(func,
+            [(0, 'call'),
+             (1, 'line'),
+             (1, 'call'),
+             (1, 'line'),
+             (2, 'line'),
+             (3, 'line'),
+             (3, 'return'),
+             (1, 'return')])
 
 class SkipLineEventsTraceTestCase(TraceTestCase):
     """Repeat the trace tests, but with per-line events skipped"""
diff --git a/Python/compile.c b/Python/compile.c
@@ -2371,6 +2371,8 @@ compiler_class(struct compiler *c, stmt_ty s)
             compiler_exit_scope(c);
             return 0;
         }
+        /* The following code is artificial */
+        c->u->u_lineno = -1;
         /* Return __classcell__ if it is referenced, otherwise return None */
         if (c->u->u_ste->ste_needs_class_closure) {
             /* Store __classcell__ into class namespace & return it */

Original file line number	Diff line number	Diff line change
`@@ -2371,6 +2371,8 @@ compiler_class(struct compiler *c, stmt_ty s)`
`2371`	`2371`	`compiler_exit_scope(c);`
`2372`	`2372`	`return 0;`
`2373`	`2373`	`}`
	`2374`	`+ /* The following code is artificial */`
	`2375`	`+ c->u->u_lineno = -1;`
`2374`	`2376`	`/* Return __classcell__ if it is referenced, otherwise return None */`
`2375`	`2377`	`if (c->u->u_ste->ste_needs_class_closure) {`
`2376`	`2378`	`/* Store __classcell__ into class namespace & return it */`