deduperreload: patch NULL for empty closure rather than None #14978
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98dfdb4 to
9e1f15f
Compare
|
Thanks! I can confirm that the suite passes with these changes! |
That was going to be my next step -- to compile cpython with assertions and verify this fixes; thank you for saving me the trouble! |
|
Np. Though given what you're doing here, it would probably make sense to test against assertion-enabled builds as part of CI. Unfortunately, I don't know an easy way to get a prebuilt version. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When patching an empty closure into some function, we should patch a value of NULL (corresponding to address 0) rather than than the address of None, as per python/cpython#138267 (comment). This has actually always been a problem with deduperreload, but it wasn't until f6fd3f5 that there was a test case that actually manifested this bug.
Anyway, this PR should fix python/cpython#138267