Fix regression with inner decorated nodes

Author: emmatyping

Doc/whatsnew/3.8.rst

@@ -80,6 +80,11 @@ Other Language Changes
 * Added support of ``\N{name}`` escapes in :mod:`regular expressions <re>`.
   (Contributed by Jonathan Eunice and Serhiy Storchaka in :issue:`30688`.)
 
+* Corrected the AST to give the actual line number of a decorated definition.
+  The first line number of the code object still points to the first
+  decorator.
+  (Contributed by Ethan Smith in :issue:`33211`.)
+
 
 New Modules
 ===========

Lib/test/inspect_fodder2.py

@@ -137,3 +137,15 @@ def func136():
         def func137():
             never_reached1
             never_reached2
+
+#line 141
+def func142():
+    @wrap
+    def inner():
+        pass
+
+#line 147
+def func148():
+    @wrap
+    class A:
+        pass

Lib/test/test_inspect.py

@@ -542,6 +542,10 @@ def test_getsource_unwrap(self):
     def test_decorator_with_lambda(self):
         self.assertSourceEqual(mod2.func114, 113, 115)
 
+    def test_inner_decorated(self):
+        self.assertSourceEqual(mod2.func142, 142, 145)
+        self.assertSourceEqual(mod2.func148, 148, 151)
+
 class TestOneliners(GetSourceBase):
     fodderModule = mod2
     def test_oneline_lambda(self):

Misc/ACKS

@@ -1502,7 +1502,7 @@ Václav Šmilauer
 Allen W. Smith
 Christopher Smith
 Eric V. Smith
-Ethan H. Smith
+Ethan Smith
 Gregory P. Smith
 Mark Smith
 Nathaniel J. Smith

Python/ast.c

@@ -1686,13 +1686,14 @@ ast_for_decorated(struct compiling *c, const node *n)
 
     if (TYPE(CHILD(n, 1)) == funcdef) {
         return ast_for_funcdef(c, CHILD(n, 1), decorator_seq);
-    } else if (TYPE(CHILD(n, 1)) == classdef) {
+    }
+    if (TYPE(CHILD(n, 1)) == classdef) {
         return ast_for_classdef(c, CHILD(n, 1), decorator_seq);
-    } else if (TYPE(CHILD(n, 1)) == async_funcdef) {
+    }
+    if (TYPE(CHILD(n, 1)) == async_funcdef) {
         return ast_for_async_funcdef(c, CHILD(n, 1), decorator_seq);
-    } else {
-        Py_UNREACHABLE();
     }
+    Py_UNREACHABLE();
 }
 
 static expr_ty

Python/compile.c

@@ -1960,7 +1960,6 @@ static int corrected_firstlineno(struct compiler *c, stmt_ty s,
     */
     if (asdl_seq_LEN(decos)) {
         expr_ty first_decorator = asdl_seq_GET(decos, 0);
-        c->u->u_firstlineno = first_decorator->lineno;
         return first_decorator->lineno;
     }
     else {
@@ -2026,6 +2025,12 @@ compiler_function(struct compiler *c, stmt_ty s, int is_async)
         return 0;
     }
 
+    // modify first line number for decorated nodes
+    if (asdl_seq_LEN(decos)) {
+        expr_ty first_decorator = asdl_seq_GET(decos, 0);
+        c->u->u_firstlineno = first_decorator->lineno;
+    }
+
     /* if not -OO mode, add docstring */
     if (c->c_optimize < 2 && s->v.FunctionDef.docstring)
         docstring = s->v.FunctionDef.docstring;
@@ -2091,6 +2096,12 @@ compiler_class(struct compiler *c, stmt_ty s)
         return 0;
     /* this block represents what we do in the new scope */
     {
+        // modify first line number for decorated nodes
+        if (asdl_seq_LEN(decos)) {
+            expr_ty first_decorator = asdl_seq_GET(decos, 0);
+            c->u->u_firstlineno = first_decorator->lineno;
+        }
+
         /* use the class name for name mangling */
         Py_INCREF(s->v.ClassDef.name);
         Py_XSETREF(c->u->u_private, s->v.ClassDef.name);

Python/importlib.h

@@ -790,8 +790,8 @@ const unsigned char _Py_M__importlib[] = {
     114,114,0,0,0,218,8,112,114,111,112,101,114,116,121,114,
     112,0,0,0,218,6,115,101,116,116,101,114,114,119,0,0,
     0,114,113,0,0,0,114,10,0,0,0,114,10,0,0,0,
-    114,10,0,0,0,114,11,0,0,0,114,102,0,0,0,172,
-    1,0,0,115,18,0,0,0,12,197,4,1,14,11,8,10,
+    114,10,0,0,0,114,11,0,0,0,114,102,0,0,0,76,
+    1,0,0,115,18,0,0,0,12,37,4,1,14,11,8,10,
     8,13,12,9,14,4,12,8,12,4,114,102,0,0,0,41,
     2,114,103,0,0,0,114,105,0,0,0,99,2,0,0,0,
     2,0,0,0,6,0,0,0,8,0,0,0,67,0,0,0,
@@ -1196,8 +1196,8 @@ const unsigned char _Py_M__importlib[] = {
     0,0,114,74,0,0,0,114,147,0,0,0,114,148,0,0,
     0,114,105,0,0,0,114,84,0,0,0,114,137,0,0,0,
     114,10,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
-    11,0,0,0,114,141,0,0,0,253,2,0,0,115,18,0,
-    0,0,12,202,12,9,14,9,14,12,12,8,12,6,16,6,
+    11,0,0,0,114,141,0,0,0,189,2,0,0,115,18,0,
+    0,0,12,10,12,9,14,9,14,12,12,8,12,6,16,6,
     16,6,16,4,114,141,0,0,0,99,0,0,0,0,0,0,
     0,0,0,0,0,0,4,0,0,0,64,0,0,0,115,140,
     0,0,0,101,0,90,1,100,0,90,2,100,1,90,3,101,
@@ -1340,7 +1340,7 @@ const unsigned char _Py_M__importlib[] = {
     0,114,137,0,0,0,114,77,0,0,0,114,147,0,0,0,
     114,148,0,0,0,114,105,0,0,0,114,10,0,0,0,114,
     10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,151,
-    0,0,0,74,3,0,0,115,18,0,0,0,12,198,12,9,
+    0,0,0,6,3,0,0,115,18,0,0,0,12,10,12,9,
     14,7,14,9,12,4,12,9,12,10,16,6,16,6,114,151,
     0,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,
     2,0,0,0,64,0,0,0,115,32,0,0,0,101,0,90,

Python/importlib_external.h

@@ -1005,7 +1005,7 @@ const unsigned char _Py_M__importlib_external[] = {
     116,104,111,100,114,173,0,0,0,114,179,0,0,0,114,182,
     0,0,0,114,183,0,0,0,114,2,0,0,0,114,2,0,
     0,0,114,2,0,0,0,114,4,0,0,0,114,170,0,0,
-    0,180,2,0,0,115,14,0,0,0,12,211,4,3,4,2,
+    0,130,2,0,0,115,14,0,0,0,12,5,4,3,4,2,
     4,3,12,7,12,15,14,16,114,170,0,0,0,99,0,0,
     0,0,0,0,0,0,0,0,0,0,2,0,0,0,64,0,
     0,0,115,48,0,0,0,101,0,90,1,100,0,90,2,100,
@@ -1474,8 +1474,8 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,114,223,0,0,0,114,228,0,0,0,90,13,95,95,
     99,108,97,115,115,99,101,108,108,95,95,114,2,0,0,0,
     114,2,0,0,0,41,1,114,213,0,0,0,114,4,0,0,
-    0,114,212,0,0,0,153,3,0,0,115,22,0,0,0,12,
-    219,8,6,8,4,8,4,16,12,12,4,8,8,12,5,8,
+    0,114,212,0,0,0,111,3,0,0,115,22,0,0,0,12,
+    5,8,6,8,4,8,4,16,12,12,4,8,8,12,5,8,
     4,8,6,8,6,114,212,0,0,0,99,0,0,0,0,0,
     0,0,0,0,0,0,0,3,0,0,0,64,0,0,0,115,
     46,0,0,0,101,0,90,1,100,0,90,2,100,1,90,3,
@@ -1729,7 +1729,7 @@ const unsigned char _Py_M__importlib_external[] = {
     0,0,0,114,161,0,0,0,114,188,0,0,0,114,202,0,
     0,0,114,118,0,0,0,114,159,0,0,0,114,2,0,0,
     0,114,2,0,0,0,114,2,0,0,0,114,4,0,0,0,
-    114,235,0,0,0,44,4,0,0,115,18,0,0,0,12,217,
+    114,235,0,0,0,253,3,0,0,115,18,0,0,0,12,8,
     8,4,8,4,8,3,8,8,8,6,8,6,8,4,8,5,
     114,235,0,0,0,99,0,0,0,0,0,0,0,0,0,0,
     0,0,2,0,0,0,64,0,0,0,115,96,0,0,0,101,
@@ -1973,8 +1973,8 @@ const unsigned char _Py_M__importlib_external[] = {
     0,114,4,1,0,0,114,161,0,0,0,114,202,0,0,0,
     114,188,0,0,0,114,187,0,0,0,114,192,0,0,0,114,
     194,0,0,0,114,2,0,0,0,114,2,0,0,0,114,2,
-    0,0,0,114,4,0,0,0,114,3,1,0,0,114,4,0,
-    0,115,16,0,0,0,8,253,8,4,12,8,8,3,8,3,
+    0,0,0,114,4,0,0,0,114,3,1,0,0,110,4,0,
+    0,115,16,0,0,0,8,1,8,4,12,8,8,3,8,3,
     8,3,8,3,8,3,114,3,1,0,0,99,0,0,0,0,
     0,0,0,0,0,0,0,0,4,0,0,0,64,0,0,0,
     115,106,0,0,0,101,0,90,1,100,0,90,2,100,1,90,
@@ -2166,7 +2166,7 @@ const unsigned char _Py_M__importlib_external[] = {
     114,14,1,0,0,114,15,1,0,0,114,18,1,0,0,114,
     182,0,0,0,114,183,0,0,0,114,2,0,0,0,114,2,
     0,0,0,114,2,0,0,0,114,4,0,0,0,114,5,1,
-    0,0,16,5,0,0,115,14,0,0,0,12,141,12,10,12,
+    0,0,152,4,0,0,115,14,0,0,0,12,5,12,10,12,
     13,12,22,12,15,14,32,14,24,114,5,1,0,0,99,0,
     0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,64,
     0,0,0,115,90,0,0,0,101,0,90,1,100,0,90,2,
@@ -2430,7 +2430,7 @@ const unsigned char _Py_M__importlib_external[] = {
     182,0,0,0,114,26,1,0,0,114,184,0,0,0,114,32,
     1,0,0,114,0,1,0,0,114,2,0,0,0,114,2,0,
     0,0,114,2,0,0,0,114,4,0,0,0,114,19,1,0,
-    0,155,5,0,0,115,18,0,0,0,12,140,8,14,8,4,
+    0,30,5,0,0,115,18,0,0,0,12,9,8,14,8,4,
     4,2,8,12,8,5,10,48,8,32,12,17,114,19,1,0,
     0,99,4,0,0,0,0,0,0,0,6,0,0,0,8,0,
     0,0,67,0,0,0,115,146,0,0,0,124,0,160,0,100,