gh-87447: Fix walrus comprehension rebind checking #100581
Open
+86
−3
Conversation
This file contains 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
|
Sorry, I did not click on the second reviewer the first time! :( |
hauntsaninja
reviewed
Dec 29, 2022
Thank you! I'm not very familiar with symtable, but left one comment.
I think it might also need a little more consensus that this is something that should be fixed; I tried to restart discussion in #87447 (comment)
Python/symtable.c
Outdated
| @@ -1488,7 +1488,8 @@ symtable_extend_namedexpr_scope(struct symtable *st, expr_ty e) | |||
| */ | |||
| if (ste->ste_comprehension) { | |||
| long target_in_scope = _PyST_GetSymbol(ste, target_name); | |||
| if (target_in_scope & DEF_COMP_ITER) { | |||
| if ((target_in_scope & DEF_COMP_ITER) && | |||
| (target_in_scope & (DEF_LOCAL | DEF_GLOBAL))) { | |||
There was a problem hiding this comment.
Hmm, should this also check DEF_NONLOCAL?
Actually, looking closer, I think DEF_GLOBAL might be impossible, because we already check for it when setting DEF_COMP_ITER. Or at least, tests pass without checking DEF_GLOBAL here.
sobolevn
commented
Dec 29, 2022
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.
I went with the most straightforward approach. I am not very qualified in this module, so I would love to hear about any possible drawbacks this solution might have!