-
Notifications
You must be signed in to change notification settings - Fork 274
Value-set dereference: use cond_exprt to avoid quadratic guards #4555
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
smowton
wants to merge
12
commits into
diffblue:develop
from
smowton:smowton/feature/value-set-deref-cond-expr
Closed
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
93e4622
Add exclusive flag to cond_exprt
smowton 1a553e0
Add accessors to cond_exprt
smowton e860099
value-set-dereference: return a cond_exprt
smowton ae870f1
goto-symex: handle cond_exprt on the LHS
smowton f57ebf2
Use lift-if more consistently
smowton 739e11d
Add lift_cond
smowton 3629f2a
Simplify cond_exprt
smowton 3645437
Add missing case to bv_pointerst
smowton 59145f1
Value-set: handle cond_exprt on the RHS
smowton b56063b
Lower cond_expr on the RHS
smowton 2fc837c
process_array_expr: handle ID_cond
smowton 2e48edd
Add cases handling cond_exprt wherever symex or value-set currently h…
smowton File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,7 @@ Author: Daniel Kroening, [email protected] | |
#include <util/arith_tools.h> | ||
#include <util/byte_operators.h> | ||
#include <util/c_types.h> | ||
#include <util/expr_iterator.h> | ||
#include <util/pointer_offset_size.h> | ||
#include <util/simplify_expr.h> | ||
|
||
|
@@ -169,6 +170,33 @@ replace_nondet(exprt &expr, symex_nondet_generatort &build_symex_nondet) | |
} | ||
} | ||
|
||
static void lower_cond_expr(exprt &expr) | ||
{ | ||
for(auto it = expr.depth_begin(), itend = expr.depth_end(); it != itend; ++it) | ||
{ | ||
if(it->id() == ID_cond) | ||
{ | ||
exprt new_expr; | ||
const auto &cond_expr = to_cond_expr(*it); | ||
INVARIANT(cond_expr.get_n_cases() >= 1, "cond_expr should not be empty"); | ||
for(std::size_t i = cond_expr.get_n_cases() - 1;; --i) | ||
{ | ||
if(i == cond_expr.get_n_cases() - 1) | ||
new_expr = cond_expr.value(i); | ||
else | ||
{ | ||
new_expr = | ||
if_exprt(cond_expr.condition(i), cond_expr.value(i), new_expr); | ||
} | ||
if(i == 0) | ||
break; | ||
} | ||
|
||
it.mutate() = std::move(new_expr); | ||
} | ||
} | ||
} | ||
|
||
void goto_symext::clean_expr( | ||
exprt &expr, | ||
statet &state, | ||
|
@@ -177,6 +205,12 @@ void goto_symext::clean_expr( | |
replace_nondet(expr, path_storage.build_symex_nondet); | ||
dereference(expr, state, write); | ||
|
||
// We know how to handle cond_exprt on the LHS (symex_assign_rec does this), | ||
// but cond_exprt on the RHS is currently patchily handled, especially by the | ||
// Java string solver. For now, lower such expressions to nested if_exprts. | ||
if(!write) | ||
lower_cond_expr(expr); | ||
|
||
// make sure all remaining byte extract operations use the root | ||
// object to avoid nesting of with/update and byte_update when on | ||
// lhs | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd use
for(std::size_t i = cond_expr.get_n_cases(); i > 0; --i)
and thenif(i == cond_expr.get_n_cases())
as well ascond_expr.value(i - 1)
and cond_expr.condition(i - 1)`.