Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32.4k
gh-135700: Fix instructions in __annotate__ have incorrect code positions#136543
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
base:main
Are you sure you want to change the base?
Uh oh!
There was an error while loading.Please reload this page.
Conversation
…e-135700.0qdtCl.rstCo-authored-by: sobolevn <mail@sobolevn.me>
Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>Co-authored-by: Frank Hoffmann <15r10nk@users.noreply.github.com>
Uh oh!
There was an error while loading.Please reload this page.
| c | ||
| """ | ||
| result = self.run_pdb_script(script, commands) | ||
| self.assertNotIn("(1)__annotate__()", result[0]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
This test passes for me on main (without this PR).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
The problem is the indentation.@AndPuQing indented my code in the strings which (for some unknown reason for me) caused the test to pass. atextwrap.dedent should help.
AndPuQingJul 13, 2025 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Yes, I fixed the indent problem, but it seems that the current fix also cannot pass the test.
======================================================================FAIL: test_issue135700 (test.test_pdb.PdbTestCase.test_issue135700)----------------------------------------------------------------------Traceback (most recent call last): File"/mnt/data/xxx/dev/cpython/Lib/test/test_pdb.py", line 3842,in test_issue135700self.assertNotIn("(1)__annotate__()", result[0]) ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^AssertionError: '(1)__annotate__()' unexpectedly found in '> ...
../cpython/python -m dis testmod.py (base) -- MAKE_CELL 0 (__conditional_annotations__) 0 RESUME 0 1 LOAD_CONST 2 (<code object __annotate__ at 0x798bd679cd50, file"testmod.py", line1>) MAKE_FUNCTION STORE_NAME 2 (__annotate__) BUILD_SET 0 STORE_NAME 0 (__conditional_annotations__) 3 LOAD_BUILD_CLASS PUSH_NULL LOAD_CONST 0 (<code object ClassVar at 0x798bd6bb1940, file"testmod.py", line3>) MAKE_FUNCTION LOAD_CONST 1 ('ClassVar') CALL 2 STORE_NAME 1 (ClassVar) 5 LOAD_NAME 0 (__conditional_annotations__) LOAD_SMALL_INT 0 SET_ADD 1 POP_TOP LOAD_CONST 3 (None) RETURN_VALUEDisassembly of<code object ClassVar at 0x798bd6bb1940, file"testmod.py", line3>: 3 RESUME 0 LOAD_NAME 0 (__name__) STORE_NAME 1 (__module__) LOAD_CONST 0 ('ClassVar') STORE_NAME 2 (__qualname__) LOAD_SMALL_INT 3 STORE_NAME 3 (__firstlineno__) 4 LOAD_CONST 1(()) STORE_NAME 4 (__static_attributes__) LOAD_CONST 2 (None) RETURN_VALUEDisassembly of<code object __annotate__ at 0x798bd679cd50, file"testmod.py", line1>: 1 RESUME 0 LOAD_FAST_BORROW 0 (format) LOAD_SMALL_INT 2 COMPARE_OP 132 (>) POP_JUMP_IF_FALSE 3 (to L1) NOT_TAKEN LOAD_COMMON_CONSTANT 1 (NotImplementedError) RAISE_VARARGS 1 L1: BUILD_MAP 0 5 LOAD_SMALL_INT 0 LOAD_GLOBAL 0 (__conditional_annotations__) CONTAINS_OP 0 (in) POP_JUMP_IF_FALSE 10 (to L2) NOT_TAKEN LOAD_GLOBAL 2 (ClassVar) COPY 2 LOAD_CONST 1 ('__dataclass_fields__') 1 STORE_SUBSCR L2: RETURN_VALUE
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
hmm,@AndPuQing your fix solved the problem which I have reported in the issue (the positions in the bytecode and column information) but not the problem with pdb because the line number of the synthetic code in__annotate__ is still 1. I don't know if there is a way to express an non existing code location (-1 maybe), but this is what would be needed here. Another solution might be to use the location of the first ast-node which is handled by the code (line 5 in this case). This would cause no line change when the code is executed. I thing this might be the most practical solution here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I feel this is more of a question for experts on tracing (you :D ). From the annotations perspective, the code here isn't directly connected to any code the user wrote; it seems reasonable to me to pretend it's on the first line of the module, or on the first annotation in the module, whatever works better for tools that use the data. But maybe Larry has a stronger opinion.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Personally I think the best solution here is to set the line number to invalid so it won't trigger a line event at all - there's no corresponding source code for it. Any unexpected side effects for this solution@iritkatriel ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
What do you mean by invalid? -1? That doesn't mean invalid exactly, it would probably get the line number of the previous instruction.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Do we have any indicator for "there's no line number for this byte code"? Anything beforeRESUME seems to have a-- with it. I'm curious whether that's a possible solution - that's the most "correct" solution. If not, we can seek for alternatives.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
We haveNO_LOCATION which usually gets replaced by a "previous instruction location", but not always (sometimes it doesn't matter). We don't currently have a way to indicate that an instruction must not have a location. It's not hard to add that, but we need to determine if that's the right thing to do.
Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Uh oh!
There was an error while loading.Please reload this page.
Uh oh!
There was an error while loading.Please reload this page.
Uh oh!
There was an error while loading.Please reload this page.
cc@15r10nk@JelleZijlstra@iritkatriel