Skip to content

SV-COMP 22 fixes #27

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 3 commits into from
Jan 14, 2022
Merged

SV-COMP 22 fixes #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bce1fea
Revert "Witnesses: add the 'creationtime' attribute"
FrNecas Oct 11, 2021
8f5c6ef
Correctly consider inlining when searching abort
FrNecas Oct 15, 2021
36c8f77
Do not ignore edges if cond is true
FrNecas Oct 24, 2021
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
10 changes: 7 additions & 3 deletions src/analyses/goto_check.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2142,13 +2142,17 @@ void goto_checkt::goto_check(
{
// These are further 'exit points' of the program
const exprt simplified_guard = simplify_expr(i.guard, ns);
// The function may be inlined to only __CPROVER_start, use the
// original location (if it is still valid thanks to setting
// adjust_false=false in goto_inlinet).
const irep_idt &former_function = i.source_location.get_function();
if(
enable_memory_cleanup_check && simplified_guard.is_false() &&
(function_identifier == "abort" || function_identifier == "exit" ||
function_identifier == "_Exit" ||
(former_function == "abort" || former_function == "exit" ||
former_function == "_Exit" ||
(i.labels.size() == 1 && i.labels.front() == "__VERIFIER_abort")))
{
memory_leak_check(function_identifier);
memory_leak_check(former_function);
}
if(!enable_assumptions)
{
Expand Down
2 changes: 2 additions & 0 deletions src/goto-programs/graphml_witness.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,10 @@ static bool filter_out(
prev_it->pc->source_location==it->pc->source_location)
return true;

#if 0
if(it->is_goto() && it->pc->get_condition().is_true())
return true;
#endif

const source_locationt &source_location=it->pc->source_location;

Expand Down
10 changes: 0 additions & 10 deletions src/xmllang/graphml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,16 +390,6 @@ bool write_graphml(const graphmlt &src, std::ostream &os)
key.set_attribute("id", "architecture");
}

// <key attr.name="creationTime" attr.type="string" for="graph"
// id="creationtime"/>
{
xmlt &key=graphml.new_element("key");
key.set_attribute("attr.name", "creationTime");
key.set_attribute("attr.type", "string");
key.set_attribute("for", "graph");
key.set_attribute("id", "creationtime");
}

// <key attr.name="producer" attr.type="string" for="graph"
// id="producer"/>
{
Expand Down