Skip to content

Constant propagation: Check type consistency before adding to replacement map #2721

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 13, 2018
Merged

Constant propagation: Check type consistency before adding to replacement map #2721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/analyses/constant_propagator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ Author: Peter Schrammel
#include <util/format_expr.h>
#endif

#include <util/ieee_float.h>
#include <util/find_symbols.h>
#include <util/arith_tools.h>
#include <util/simplify_expr.h>
#include <util/base_type.h>
#include <util/cprover_prefix.h>
#include <util/find_symbols.h>
#include <util/ieee_float.h>
#include <util/simplify_expr.h>

#include <langapi/language_util.h>

Expand All @@ -46,7 +47,12 @@ void constant_propagator_domaint::assign_rec(
partial_evaluate(tmp, ns);

if(tmp.is_constant())
{
DATA_INVARIANT(
base_type_eq(ns.lookup(s).type, tmp.type(), ns),
"type of constant to be replaced should match");
values.set_to(s, tmp);
}
else
values.set_to_top(s);
}
Expand Down Expand Up @@ -258,7 +264,7 @@ bool constant_propagator_domaint::two_way_propagate_rec(
assign_rec(copy_values, lhs, rhs, ns);
if(!values.is_constant(rhs) || values.is_constant(lhs))
assign_rec(values, rhs, lhs, ns);
change=values.meet(copy_values);
change = values.meet(copy_values, ns);
}
#endif

Expand Down Expand Up @@ -469,7 +475,9 @@ bool constant_propagator_domaint::valuest::merge(const valuest &src)

/// meet
/// \return Return true if "this" has changed.
bool constant_propagator_domaint::valuest::meet(const valuest &src)
bool constant_propagator_domaint::valuest::meet(
const valuest &src,
const namespacet &ns)
{
if(src.is_bottom || is_bottom)
return false;
Expand All @@ -492,6 +500,9 @@ bool constant_propagator_domaint::valuest::meet(const valuest &src)
}
else
{
DATA_INVARIANT(
base_type_eq(ns.lookup(m.first).type, m.second.type(), ns),
"type of constant to be stored should match");
set_to(m.first, m.second);
changed=true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/analyses/constant_propagator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class constant_propagator_domaint:public ai_domain_baset
bool is_bottom;

bool merge(const valuest &src);
bool meet(const valuest &src);
bool meet(const valuest &src, const namespacet &ns);

// set whole state

Expand Down