Skip to content

De-duplicate explicit-allocation check construction #5852

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
Feb 24, 2021
Merged

De-duplicate explicit-allocation check construction #5852

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
32 changes: 10 additions & 22 deletions src/analyses/goto_check.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,25 +1399,10 @@ void goto_checkt::bounds_check(

binary_relation_exprt inequality(effective_offset, ID_lt, size_casted);

exprt::operandst alloc_disjuncts;
for(const auto &a : allocations)
{
typecast_exprt int_ptr{pointer, a.first.type()};

binary_relation_exprt lower_bound_check{a.first, ID_le, int_ptr};

plus_exprt upper_bound{
int_ptr,
typecast_exprt::conditional_cast(ode.offset(), int_ptr.type())};

binary_relation_exprt upper_bound_check{
std::move(upper_bound), ID_lt, plus_exprt{a.first, a.second}};

alloc_disjuncts.push_back(
and_exprt{std::move(lower_bound_check), std::move(upper_bound_check)});
}

exprt in_bounds_of_some_explicit_allocation = disjunction(alloc_disjuncts);
exprt in_bounds_of_some_explicit_allocation =
is_in_bounds_of_some_explicit_allocation(
pointer,
plus_exprt{ode.offset(), from_integer(1, ode.offset().type())});

or_exprt precond(
std::move(in_bounds_of_some_explicit_allocation),
Expand Down Expand Up @@ -2299,11 +2284,14 @@ exprt goto_checkt::is_in_bounds_of_some_explicit_allocation(

binary_relation_exprt lb_check(a.first, ID_le, int_ptr);

plus_exprt ub{int_ptr, size};
plus_exprt upper_bound{
int_ptr, typecast_exprt::conditional_cast(size, int_ptr.type())};

binary_relation_exprt ub_check(ub, ID_le, plus_exprt(a.first, a.second));
binary_relation_exprt ub_check{
std::move(upper_bound), ID_le, plus_exprt{a.first, a.second}};

alloc_disjuncts.push_back(and_exprt(lb_check, ub_check));
alloc_disjuncts.push_back(
and_exprt{std::move(lb_check), std::move(ub_check)});
}
return disjunction(alloc_disjuncts);
}
Expand Down