Skip to content

gh-104686: Fix tracing for decorated classes #104708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions Lib/test/test_sys_settrace.py
Original file line number Diff line number Diff line change
Expand Up @@ -1524,6 +1524,52 @@ def __init__(self):
(3, 'return'),
(1, 'return')])

def test_class_creation_with_decorator(self):
def func():
def decorator(arg):
def _dec(c):
return c
return _dec

@decorator(6)
@decorator(
len([8]),
)
class MyObject:
pass

self.run_and_compare(func, [
(0, 'call'),
(1, 'line'),
(6, 'line'),
(1, 'call'),
(2, 'line'),
(4, 'line'),
(4, 'return'),
(7, 'line'),
(8, 'line'),
(7, 'line'),
(1, 'call'),
(2, 'line'),
(4, 'line'),
(4, 'return'),
(10, 'line'),
(6, 'call'),
(6, 'line'),
(11, 'line'),
(11, 'return'),
(7, 'line'),
(2, 'call'),
(3, 'line'),
(3, 'return'),
(6, 'line'),
(2, 'call'),
(3, 'line'),
(3, 'return'),
(10, 'line'),
(10, 'return'),
])

@support.cpython_only
def test_no_line_event_after_creating_generator(self):
# Spurious line events before call events only show up with C tracer
Expand Down
4 changes: 4 additions & 0 deletions Python/compile.c
Original file line number Diff line number Diff line change
Expand Up @@ -2486,6 +2486,10 @@ compiler_class_body(struct compiler *c, stmt_ty s, int firstlineno)
}

/* 2. load the 'build_class' function */

// these instructions should be attributed to the class line,
// not a decorator line
loc = LOC(s);
ADDOP(c, loc, PUSH_NULL);
ADDOP(c, loc, LOAD_BUILD_CLASS);

Expand Down