IncrementalCompact: Don't corrupt CFG when finishing early #54298
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
aviatesk
reviewed
Apr 29, 2024
test/compiler/compact.jl
Outdated
| compact = IncrementalCompact(ir) | ||
|
|
||
| insert_node_here!(compact, NewInstruction(ReturnNode(1), Union{}, ir[SSAValue(1)][:line])) | ||
| new_ir = complete(compact) |
There was a problem hiding this comment.
Suggested change
| new_ir = complete(compact) | |
| new_ir = Core.Compiler.finish(compact) |
Shouldn't we use finish, or complete + Core.Compiler.non_dce_finish!?
There was a problem hiding this comment.
Yeah, probably, I got confused by the other test using complete. Although this does make me suspicious whether this whole thing shouldn't be in non_dce_finish! in the first place. It's already trying to finish the basic block there, it's just doing the wrong one. Let me make the adjustment.
Finishing an IncrementalComapact before iterating the whole underlying IRCode is not something that we really do in base, or at least not in places other than a basic block boundary. However, it can be useful for downstream consumers, so make it work anyway. Also create a separate test file for IncrementalCompact tests (of which we really should have more) and move one existing test.
Keno
force-pushed
the
kf/compactearlyfinish
branch
from
4420b48
to
9b401ba
Compare
aviatesk
approved these changes
Apr 29, 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.
Finishing an IncrementalComapact before iterating the whole underlying IRCode is not something that we really do in base, or at least not in places other than a basic block boundary. However, it can be useful for downstream consumers, so make it work anyway. Also create a separate test file for IncrementalCompact tests (of which we really should have more) and move one existing test.