No longer marking blocks with labels with invariants as loop head blocks if they aren't loop heads#859
Merged
Conversation
…cks if they aren't actually loop heads
….com/viperproject/silver into meilers_fix_non_loop_head_inv_labels
This was referenced Mar 19, 2025
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
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.
This fixes viperproject/silicon#525 and viperproject/silicon#607.
The code used to mark every block starting with a label with an invariant as a loop head block, even if it's not.
This PR changes that by first of all making blocks starting with labels with invariants as normal statement blocks, which remember the invariant and loop ID they should have if they turn out to be loop heads.
Later, when we discover that such a block is actually a loop head, we use the existing code that transforms it into a loop head code, and extend this code to retrieve the invariant that is now stored in the statement block.
Also adding a few more test cases for goto-loops.