Sort blocks by line number of the first opcode #1786
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
![copybara-service[bot]](https://avatars.githubusercontent.com/in/44061?s=60&v=4){kind=small}
Blocks are sorted by number of predecessors. Previously the index of the first opcode, i.e. the order in the bytecode, served as a tie breaker.
In Python 3.12 the added test case fails with:
dummy_input_file:10:3: error: in <module>: None [assert-type]
Expected: Optional[str]
Actual: None
assert_type(err, str|None)
~~~~~~~~~~~~~~~~~~~~~~~~~~
Python 3.12 emits the bytecode for the `except` block last for some reason.
Because of the while loop, every block is a predecessor of every other block, and the predecessor-based sorting fails. It falls back to the tie breaker and pytype executes the `except` block last, i.e. after `assert_type`. By the time pytype executes `assert_type` it don't know about the possible `str` type.
This change uses the line number of the first opcode as a tie breaker first and then falls back to the index.
PiperOrigin-RevId: 679166584
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.
Sort blocks by line number of the first opcode
Blocks are sorted by number of predecessors. Previously the index of the first opcode, i.e. the order in the bytecode, served as a tie breaker.
In Python 3.12 the added test case fails with:
Python 3.12 emits the bytecode for the
exceptblock last for some reason.Because of the while loop, every block is a predecessor of every other block, and the predecessor-based sorting fails. It falls back to the tie breaker and pytype executes the
exceptblock last, i.e. afterassert_type. By the time pytype executesassert_typeit don't know about the possiblestrtype.This change uses the line number of the first opcode as a tie breaker first and then falls back to the index.