Skip to content

Avoid shadowing in custom bitvector analysis [blocks: #2310] #3354

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
kroening merged 1 commit into from
Nov 11, 2018
+10 −12
Merged

Avoid shadowing in custom bitvector analysis [blocks: #2310] #3354

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
22 changes: 10 additions & 12 deletions src/analyses/custom_bitvector_analysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,14 @@ std::set<exprt> custom_bitvector_analysist::aliases(
{
exprt pointer=to_dereference_expr(src).pointer();

std::set<exprt> pointer_set=
const std::set<exprt> alias_set =
local_may_alias_factory(loc).get(loc, pointer);

std::set<exprt> result;

for(const auto &pointer : pointer_set)
if(pointer.type().id()==ID_pointer)
result.insert(dereference_exprt(pointer));
for(const auto &alias : alias_set)
if(alias.type().id() == ID_pointer)
result.insert(dereference_exprt(alias));

result.insert(src);

Expand Down Expand Up @@ -261,8 +261,7 @@ void custom_bitvector_domaint::assign_struct_rec(
{
dereference_exprt lhs_deref(lhs);
dereference_exprt rhs_deref(rhs);
vectorst rhs_vectors=get_rhs(rhs_deref);
assign_lhs(lhs_deref, rhs_vectors);
assign_lhs(lhs_deref, get_rhs(rhs_deref));
}
}
}
Expand Down Expand Up @@ -378,9 +377,9 @@ void custom_bitvector_domaint::transform(
// may alias other stuff
std::set<exprt> lhs_set=cba.aliases(deref, from);

for(const auto &lhs : lhs_set)
for(const auto &l : lhs_set)
{
set_bit(lhs, bit_nr, mode);
set_bit(l, bit_nr, mode);
}
}
}
Expand Down Expand Up @@ -436,8 +435,7 @@ void custom_bitvector_domaint::transform(
{
dereference_exprt lhs_deref(p);
dereference_exprt rhs_deref(*arg_it);
vectorst rhs_vectors=get_rhs(rhs_deref);
assign_lhs(lhs_deref, rhs_vectors);
assign_lhs(lhs_deref, get_rhs(rhs_deref));
}

++arg_it;
Expand Down Expand Up @@ -511,9 +509,9 @@ void custom_bitvector_domaint::transform(
// may alias other stuff
std::set<exprt> lhs_set=cba.aliases(deref, from);

for(const auto &lhs : lhs_set)
for(const auto &l : lhs_set)
{
set_bit(lhs, bit_nr, mode);
set_bit(l, bit_nr, mode);
}
}
}
Expand Down