GH-111537: Avoid using this_instr in asserts.
#111600
Merged
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
…n_offset = next_instr - this_instr' as can rely on C compiler to replace it with a constant
iritkatriel
reviewed
Nov 1, 2023
Python/bytecodes.c
Outdated
| @@ -657,8 +657,7 @@ dummy_func( | |||
| STACK_SHRINK(2); | |||
| new_frame->localsplus[0] = container; | |||
| new_frame->localsplus[1] = sub; | |||
| assert(1 + INLINE_CACHE_ENTRIES_BINARY_SUBSCR == next_instr - this_instr); | |||
| frame->return_offset = 1 + INLINE_CACHE_ENTRIES_BINARY_SUBSCR; | |||
| frame->return_offset = next_instr - this_instr; | |||
There was a problem hiding this comment.
This probably needs a cast to uint16_t
There was a problem hiding this comment.
It's guaranteed to be small. So, I think it should be OK. Let's see if MSVC complains.
There was a problem hiding this comment.
It does, indeed, complain
iritkatriel
approved these changes
Nov 1, 2023
FullteaR
pushed a commit
to FullteaR/cpython
that referenced
this pull request
Nov 3, 2023
aisk
pushed a commit
to aisk/cpython
that referenced
this pull request
Feb 11, 2024
Glyphack
pushed a commit
to Glyphack/cpython
that referenced
this pull request
Sep 2, 2024
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.
Replace
frame->return_offset = 1 + INLINE_CACHE_withframe->return_offset = next_instr - this_instrAs we now specify
this_instrin terms ofnext_instr, we can rely on the C compiler to replacenext_instr - this_instrwith a constantunused variable ‘this_instr’ingenerated_cases.c.h#111537