Skip to content

gh-130775: Allow negative locations in ast - #130795

Merged
sobolevn merged 5 commits into
python:mainfrom
sobolevn:issue-130775
Apr 7, 2025
Merged

gh-130775: Allow negative locations in ast#130795
sobolevn merged 5 commits into
python:mainfrom
sobolevn:issue-130775

Conversation

@sobolevn

@sobolevn sobolevn commented Mar 3, 2025 •
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

@sobolevn
sobolevn requested a review from picnixz March 3, 2025 17:03
@bedevere-app bedevere-app Bot mentioned this pull request Mar 3, 2025
Closed
picnixz
picnixz reviewed Mar 3, 2025
View reviewed changes

@picnixz picnixz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we cannot bypass the ast.c layer and directly end up in the assemble.c, then this should be the correct approach (I didn't know where we validate the locations).

Comment thread Lib/test/test_ast/test_ast.py
Comment on lines +211 to +214
{'lineno': -2, 'col_offset': 0},
{'lineno': 0, 'col_offset': -2},
{'lineno': 0, 'col_offset': -2, 'end_col_offset': -2},
{'lineno': -2, 'end_lineno': -2, 'col_offset': 0},

@picnixz picnixz Mar 3, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Off topic: are we already testing that passing a non-int is fine?
  • Maybe test with values that are excessively large (either in + or -) just for overflow checks.

@sobolevn sobolevn Mar 3, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will open a new issue for that, if we don't. Thanks for the idea.

vstinner
vstinner reviewed Mar 3, 2025
View reviewed changes
Comment thread Python/ast.c Outdated
@sobolevn @vstinner
Update Python/ast.c
9d2037e 
Co-authored-by: Victor Stinner <[email protected]>
picnixz
picnixz reviewed Mar 3, 2025
View reviewed changes
Comment thread Misc/NEWS.d/next/Core_and_Builtins/2025-03-03-20-02-45.gh-issue-130775.fEM6T-.rst Outdated
vstinner
vstinner previously approved these changes Mar 3, 2025
View reviewed changes

@vstinner vstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I just suggest a shorter test name :-)

Comment thread Lib/test/test_ast/test_ast.py Outdated
iritkatriel
iritkatriel reviewed Mar 3, 2025
View reviewed changes
Comment thread Misc/NEWS.d/next/Core_and_Builtins/2025-03-03-20-02-45.gh-issue-130775.fEM6T-.rst Outdated
Comment thread Lib/test/test_ast/test_ast.py Outdated
Comment thread Python/assemble.c Outdated
Comment thread Python/ast.c Outdated
JelleZijlstra
JelleZijlstra reviewed Mar 3, 2025
View reviewed changes
Comment thread Python/ast.c Outdated
@vstinner
vstinner dismissed their stale review March 7, 2025 16:08

I remove my LGTM vote, I didn't notice that -1 value is still allowed. I'm not sure about rejecting values <= -2.

@sobolevn

sobolevn commented Mar 13, 2025 •
edited
Loading

Copy link
Copy Markdown
Member Author

Ok, I followed the idea in #130795 (comment) by @JelleZijlstra and now all negative locations are just allowed. This way we won't have any compat issues and can backport this fix easily.

Thanks a lot, everyone!

vstinner
vstinner approved these changes Mar 13, 2025
View reviewed changes

@vstinner vstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@sobolevn

sobolevn commented Mar 13, 2025

Copy link
Copy Markdown
Member Author

Looks like #130627 changed a lot of related things. Digging into it.

@sobolevn
sobolevn requested a review from JelleZijlstra April 7, 2025 12:01
@sobolevn
sobolevn requested a review from iritkatriel April 7, 2025 12:02
@sobolevn
sobolevn merged commit bc5233b into python:main Apr 7, 2025
@sobolevn sobolevn added needs backport to 3.12 only security fixes needs backport to 3.13 only security fixes labels Apr 7, 2025
@miss-islington-app

miss-islington-app Bot commented Apr 7, 2025

Copy link
Copy Markdown

Thanks @sobolevn for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Apr 7, 2025

Copy link
Copy Markdown

Thanks @sobolevn for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Apr 7, 2025

Copy link
Copy Markdown

Sorry, @sobolevn, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker bc5233b6a5cdd8f77a4737ce317f94110869c082 3.12

@miss-islington-app

miss-islington-app Bot commented Apr 7, 2025

Copy link
Copy Markdown

Sorry, @sobolevn, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker bc5233b6a5cdd8f77a4737ce317f94110869c082 3.13

@sobolevn

sobolevn commented Apr 7, 2025

Copy link
Copy Markdown
Member Author

Thanks everyone! 🎉

@sobolevn

sobolevn commented Apr 7, 2025

Copy link
Copy Markdown
Member Author

I will work on manual backports today.

@sobolevn sobolevn changed the title gh-130775: Validate negative locations in ast gh-130775: Allow negative locations in ast Apr 7, 2025
sobolevn added a commit to sobolevn/cpython that referenced this pull request Apr 7, 2025
@sobolevn @vstinner
[3.13] pythongh-130775: Allow negative locations in ast (pythonGH-1…
bbe8dc2 
…30795)

(cherry picked from commit bc5233b)

Co-authored-by: sobolevn <[email protected]>
Co-authored-by: Victor Stinner <[email protected]>
@bedevere-app

bedevere-app Bot commented Apr 7, 2025

Copy link
Copy Markdown

GH-132243 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.13 only security fixes label Apr 7, 2025
Yhg1s pushed a commit that referenced this pull request Apr 8, 2025
@sobolevn @vstinner
[3.13] gh-130775: Allow negative locations in ast (GH-130795) (#132243
7a83644 
)

(cherry picked from commit bc5233b)

Co-authored-by: Victor Stinner <[email protected]>
sobolevn added a commit to sobolevn/cpython that referenced this pull request Apr 8, 2025
@sobolevn @vstinner
[3.12] pythongh-130775: Allow negative locations in ast (pythonGH-1…
4c8f777 
…30795)

(cherry picked from commit bc5233b)

Co-authored-by: sobolevn <[email protected]>
Co-authored-by: Victor Stinner <[email protected]>
@bedevere-app

bedevere-app Bot commented Apr 8, 2025

Copy link
Copy Markdown

GH-132260 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Apr 8, 2025
Yhg1s pushed a commit that referenced this pull request Apr 8, 2025
@sobolevn @vstinner
[3.12] gh-130775: Allow negative locations in ast (GH-130795) (#132260
492a554 
)

(cherry picked from commit bc5233b)

Co-authored-by: sobolevn <[email protected]>
Co-authored-by: Victor Stinner <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cfbolz cfbolz cfbolz left review comments
@picnixz picnixz picnixz left review comments
@vstinner vstinner vstinner approved these changes
@JelleZijlstra JelleZijlstra JelleZijlstra approved these changes
@Eclips4 Eclips4 Awaiting requested review from Eclips4 Eclips4 is a code owner
@isidentical isidentical Awaiting requested review from isidentical
@markshannon markshannon Awaiting requested review from markshannon markshannon is a code owner
@iritkatriel iritkatriel Awaiting requested review from iritkatriel iritkatriel is a code owner

Assignees

@sobolevn sobolevn

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@sobolevn @cfbolz @vstinner @JelleZijlstra @iritkatriel @picnixz