Skip to content

Update retroactive comments from GH-117741 (segfault in FutureIter_dealloc) #121638

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
Jul 12, 2024

Conversation

savannahostrowski
Copy link
Member

This PR addresses a couple of small comments left by @kumaraditya303 in #117741.

Copy link
Contributor

@willingc willingc left a comment

Choose a reason for hiding this comment

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

@willingc willingc merged commit 65feded into python:main Jul 12, 2024
41 checks passed
@willingc willingc added needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels Jul 12, 2024
@miss-islington-app
Copy link

Thanks @savannahostrowski for the PR, and @willingc for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington-app
Copy link

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

@miss-islington-app
Copy link

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

cherry_picker 65fededf9cc1780d5edbef8a6e0a7cf9bc15aea6 3.12

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 12, 2024
…Iter_dealloc`) (pythonGH-121638)

Address comments
(cherry picked from commit 65feded)

Co-authored-by: Savannah Ostrowski <[email protected]>
@bedevere-app
Copy link

bedevere-app bot commented Jul 12, 2024

GH-121642 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 Jul 12, 2024
@willingc willingc removed the needs backport to 3.12 only security fixes label Jul 12, 2024
willingc pushed a commit that referenced this pull request Jul 12, 2024
…eIter_dealloc`) (GH-121638) (GH-121642)

Update retroactive comments from GH-117741 (segfault in `FutureIter_dealloc`) (GH-121638)

Address comments
(cherry picked from commit 65feded)

Co-authored-by: Savannah Ostrowski <[email protected]>
@@ -1650,7 +1650,6 @@ FutureIter_dealloc(futureiterobject *it)
{
PyTypeObject *tp = Py_TYPE(it);

// FutureIter is a heap type so any subclass must also be a heap type.
assert(_PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE));
Copy link
Contributor

Choose a reason for hiding this comment

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

Assert is redundant.

@kumaraditya303
Copy link
Contributor

Post commit LGTM

estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024
@savannahostrowski savannahostrowski deleted the update-comments branch September 27, 2024 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants