Skip to content

Fixed a bug in local_bitvector_analysis wherein an expression's ID was used in place of the expression's type's ID. #2626

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 2 commits into from
Jul 30, 2018
Merged

Fixed a bug in local_bitvector_analysis wherein an expression's ID was used in place of the expression's type's ID. #2626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
131e525
Fixed a bug in local_bitvector_analysis wherein an expression's ID was
Jul 27, 2018
1e07546
Fixed secondary issues arising from local_bitvector_analysis fix.
Jul 27, 2018
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
6 changes: 3 additions & 3 deletions regression/cbmc/memory_allocation1/test.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ main.c
--pointer-check
^EXIT=10$
^SIGNAL=0$
\[main.pointer_dereference.2\] dereference failure: pointer invalid in \*p: SUCCESS
\[main.pointer_dereference.[0-9]+\] dereference failure: pointer invalid in \*p: SUCCESS
\[main.assertion.1\] assertion \*p==42: SUCCESS
\[main.pointer_dereference.14\] dereference failure: pointer invalid in p\[.*1\]: FAILURE
\[main.pointer_dereference.[0-9]+\] dereference failure: pointer invalid in p\[.*1\]: FAILURE
\[main.assertion.2\] assertion \*\(p\+1\)==42: SUCCESS
\*\* 12 of 26 failed
^VERIFICATION FAILED$
--
^warning: ignoring
21 changes: 15 additions & 6 deletions src/analyses/goto_check.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,8 @@ void goto_checkt::pointer_validity_check(
allocs=disjunction(disjuncts);
}

if(flags.is_unknown() || flags.is_null())
if(flags.is_unknown() ||
flags.is_null())
{
add_guarded_claim(
or_exprt(allocs, not_exprt(null_pointer(pointer))),
Expand All @@ -1002,7 +1003,8 @@ void goto_checkt::pointer_validity_check(
guard);
}

if(flags.is_unknown())
if(flags.is_unknown() ||
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest braces around if block when condition spans multiple lines

flags.is_integer_address())
add_guarded_claim(
or_exprt(allocs, not_exprt(invalid_pointer(pointer))),
"dereference failure: pointer invalid",
Expand All @@ -1020,7 +1022,9 @@ void goto_checkt::pointer_validity_check(
expr,
guard);

if(flags.is_unknown() || flags.is_dynamic_heap())
if(flags.is_unknown() ||
flags.is_dynamic_heap() ||
flags.is_integer_address())
add_guarded_claim(
or_exprt(allocs, not_exprt(deallocated(pointer, ns))),
"dereference failure: deallocated dynamic object",
Expand All @@ -1029,7 +1033,9 @@ void goto_checkt::pointer_validity_check(
expr,
guard);

if(flags.is_unknown() || flags.is_dynamic_local())
if(flags.is_unknown() ||
flags.is_dynamic_local() ||
flags.is_integer_address())
add_guarded_claim(
or_exprt(allocs, not_exprt(dead_object(pointer, ns))),
"dereference failure: dead object",
Expand All @@ -1038,7 +1044,9 @@ void goto_checkt::pointer_validity_check(
expr,
guard);

if(flags.is_unknown() || flags.is_dynamic_heap())
if(flags.is_unknown() ||
flags.is_dynamic_heap() ||
flags.is_integer_address())
{
const or_exprt dynamic_bounds(
dynamic_object_lower_bound(pointer, ns, access_lb),
Expand All @@ -1059,7 +1067,8 @@ void goto_checkt::pointer_validity_check(

if(flags.is_unknown() ||
flags.is_dynamic_local() ||
flags.is_static_lifetime())
flags.is_static_lifetime() ||
flags.is_integer_address())
{
const or_exprt object_bounds(
object_lower_bound(pointer, ns, access_lb),
Expand Down
2 changes: 1 addition & 1 deletion src/analyses/local_bitvector_analysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ bool local_bitvector_analysist::is_tracked(const irep_idt &identifier)
{
localst::locals_mapt::const_iterator it=locals.locals_map.find(identifier);
if(it==locals.locals_map.end() ||
it->second.id()!=ID_pointer ||
it->second.type().id()!=ID_pointer ||
dirty(identifier))
return false;

Expand Down