Skip to content

gh-132744: Check recursion limit in _PY_FRAME_GENERAL#132746

Merged
markshannon merged 6 commits intopython:mainfrom
Fidget-Spinner:fix_recursion
May 2, 2025
Merged

gh-132744: Check recursion limit in _PY_FRAME_GENERAL#132746
markshannon merged 6 commits intopython:mainfrom
Fidget-Spinner:fix_recursion

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
Closed
@markshannon
Copy link
Member

markshannon commented Apr 29, 2025

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
Copy link
Member Author

Fidget-Spinner commented Apr 29, 2025

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

miss-islington-app bot commented May 5, 2025

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

miss-islington-app bot commented May 5, 2025

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

Pranjal095 pushed a commit to Pranjal095/cpython that referenced this pull request Jul 12, 2025
@Fidget-Spinner @Pranjal095
pythongh-132744: Check recursion limit in CALL_PY_GENERAL (pythonGH-1…
5de6eac 
…32746)
@serhiy-storchaka
Copy link
Member

serhiy-storchaka commented Aug 14, 2025

Reminder about backporting. @Fidget-Spinner @markshannon

@bedevere-app
Copy link

bedevere-app bot commented Aug 21, 2025

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

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Aug 21, 2025
Fidget-Spinner pushed a commit that referenced this pull request Aug 22, 2025
@skv0zsneg
[3.13] gh-132744: Check recursion limit in _PY_FRAME_GENERAL (GH-132746…
ebccd1d 
…) (GH-138032)
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

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Fidget-Spinner @markshannon @serhiy-storchaka