gh-134584: Eliminate redundant refcounting from _STORE_SUBSCR_DICT #142712
+88
−23
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
corona10
requested review from
Fidget-Spinner,
markshannon and
tomasr8
as code owners
30 tasks
corona10
changed the title
Python/bytecodes.c
Outdated
| } | ||
| INPUTS_DEAD(); | ||
| st = dict_st; | ||
| sb = sub; |
Member
There was a problem hiding this comment.
Reference to sub is already stolen by _PyDict_SetItem_Take2. So you can't pass this down.
Python/bytecodes.c
Outdated
| PyStackRef_CLOSE(dict_st); | ||
| ERROR_IF(err); | ||
| if (err) { | ||
| ERROR_NO_POP(); |
Member
There was a problem hiding this comment.
We can't do this here. The problem is that _PyDict_SetItem_Take2 has already stolen the references to sub and value. This means when we jump to error, we decref sub and value again, causing a double decref.
The fix might be to do
if (err) {
PyStackRef_CLOSE(dict_st);
ERROR_IF(1);
}
Member
Author
|
@Fidget-Spinner Done :) Thanks for the guide. |
| } | ||
|
|
||
| op(_STORE_SUBSCR_DICT, (value, dict_st, sub -- st)) { | ||
| (void)value; |
Member
There was a problem hiding this comment.
Can you please add a (void)sub here as well? So that we don't get compiler warnings.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Uh oh!
There was an error while loading. Please reload this page.