8000 gh-132744: Check recursion limit in _PY_FRAME_GENERAL by Fidget-Spinner · Pull Request #132746 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-132744: Check recursion limit in _PY_FRAME_GENERAL #132746

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 6 commits into from
May 2, 2025
Merged

gh-132744: Check recursion limit in _PY_FRAME_GENERAL #132746

merged 6 commits into from
May 2, 2025
+220 −170

Conversation

Fidget-Spinner
Copy link
Member
@Fidget-Spinner Fidget-Spinner commented Apr 20, 2025 •
edited by bedevere-app bot
Loading

@python-cla-bot
Copy link
python-cla-bot bot commented Apr 20, 2025 •
edited
Loading

All commit authors signed the Contributor License Agreement.

CLA signed

@bedevere-app bedevere-app bot mentioned this pull request Apr 20, 2025
Open
@markshannon
Copy link
Member

Would it be better to add the _CHECK_STACK_SPACE micro-op to the CALL_PY_GENERAL and CALL_BOUND_METHOD_GENERAL macro instructions?

@Fidget-Spinner
Address review
< 8000 /div>
0a0a496
@Fidget-Spinner
Copy link
Member Author

Would it be better to add the _CHECK_STACK_SPACE micro-op to the CALL_PY_GENERAL and CALL_BOUND_METHOD_GENERAL macro instructions?

Done.

@Fidget-Spinner
Copy link
Member Author
Fidget-Spinner commented Apr 29, 2025 •
edited
Loading

Actually, those two instructions don't need to check stack space (they use the frame push that can fail, instead of the one that pushes without checks), they only need to check recursion remaining. So I split it into another uop to make things more efficient.

markshannon
markshannon approved these changes Apr 30, 2025
View reviewed changes
Copy link
Member
@markshannon markshannon left a comment

Choose a reason for hiding this comment

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

Thanks

@markshannon markshannon merged commit ddac7ac into python:main May 2, 2025
64 checks passed
@Fidget-Spinner Fidget-Spinner deleted the fix_recursion branch May 2, 2025 17:08
@markshannon markshannon mentioned this pull request May 2, 2025
Merged
@markshannon markshannon added the needs backport to 3.13 bugs and security fixes label May 5, 2025
@miss-islington-app
Copy link

Thanks @Fidget-Spinner for the PR, and @markshannon for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Sorry, @Fidget-Spinner and @markshannon, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker ddac7ac59a7dfa4437562b6e705e64865c3b1e9a 3.13

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@markshannon markshannon markshannon approved these changes

Assignees

@markshannon markshannon

Labels
needs backport to 3.13 bugs and security fixes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Fidget-Spinner @markshannon
0