GH-98686: Fix compiler warning for HAS_ARG
#99106
Merged
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
Member
brandtbucher
commented
Nov 4, 2022
•
brandtbucher
commented
- Issue: Quicken everything #98686
brandtbucher
added
skip news
interpreter-core
iritkatriel
reviewed
Nov 4, 2022
Python/ceval.c
Outdated
| @@ -143,7 +143,7 @@ lltrace_instruction(_PyInterpreterFrame *frame, | |||
| const char *opname = _PyOpcode_OpName[opcode]; | |||
| assert(opname != NULL); | |||
| int offset = (int)(next_instr - _PyCode_CODE(frame->f_code)); | |||
| if (HAS_ARG(_PyOpcode_Deopt[opcode])) { | |||
| if (HAVE_ARGUMENT <= _PyOpcode_Deopt[opcode]) { | |||
There was a problem hiding this comment.
HAVE_ARGUMENT isn't used directly anywhere else. I think casting and using HAS_ARG might be better.
There was a problem hiding this comment.
But we don't have to worry about things like pseudo-opcodes, right? This seems like exactly the sort of thing HAVE_ARGUMENT is meant for...
There was a problem hiding this comment.
Kind of. HAVE_ARGUMENT was there before we had pseudo-opcodes, and HAS_ARG just compared with it. Now we have pseudo-opcodes, and if I saw HAVE_ARGUMENT in the code now my first thought would be that this is a bug (a place where we didn't update for pseudo-opcodes). So the trick is to make this not look like a bug.
iritkatriel
approved these changes
Nov 4, 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.
Suggestion cannot be applied right now. Please check back later.