Smowton/fix/type equality improvements #4173
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
No functional changes
The check is probably ok to go too, but we should make type preservation of `simplify` an invariant first.
smowton
requested review from
chrisr-diffblue,
kroening,
martin-cs,
peterschrammel,
pkesseli and
tautschnig
as code owners
kroening
approved these changes
Feb 13, 2019
tautschnig
approved these changes
Feb 13, 2019
| { | ||
| std::cerr << symbol << '\n'; | ||
| std::cerr << ns.lookup(id) << '\n'; | ||
| } | ||
| INVARIANT(base_type_eq(symbol.type, ns.lookup(id).type, ns), | ||
| "type matches"); | ||
| INVARIANT(symbol.type == ns.lookup(id).type, "type matches"); | ||
| #endif |
There was a problem hiding this comment.
I'd say you can just remove this code.
| @@ -262,9 +262,6 @@ bool simplify_exprt::simplify_member(exprt &expr) | |||
|
|
|||
| // Guess: turning this into a byte-extract operation is not really an | |||
| // optimisation. | |||
| // The type_eq check is because get_subexpression_at_offset uses | |||
| // base_type_eq, whereas in the context of a simplifier we should not | |||
| // change the type of the expression. | |||
There was a problem hiding this comment.
I'll note down a TODO on my end to remove that type equality check when enabling the simplifier type equality checks.
|
Assigning @kroening since it's his PR. CI failures expected for the time being. |
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.
Note this targets the
type-equalitybranch -- I think these changes should go in alongside it. The value-set fixup is functional; everything else is cosmetic.