Skip to content

Remove SSA thread suffix in goto trace address-of expressions #8761

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

Draft
tautschnig wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Remove SSA thread suffix in goto trace address-of expressions #8761

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
10 changes: 5 additions & 5 deletions regression/cbmc-cover/pointer-function-parameters-2/test.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ main.c
a=\(\(signed int \*\*\)NULL\)
tmp(\$\d+)?=[^,]*
tmp(\$\d+)?=[^,]*
a=&tmp(\$\d+)?!0
a=&tmp(\$\d+)?
tmp(\$\d+)?=\(\(signed int \*\)NULL\)
tmp(\$\d+)?=[^,]*
a=&tmp(\$\d+)?!0
tmp(\$\d+)?=&tmp\$\d+!0
a=&tmp(\$\d+)?
tmp(\$\d+)?=&tmp(\$\d+)?
tmp(\$\d+)?=(-[0-9]+|[012356789][0-9]*|4[0-9]+)
a=&tmp(\$\d+)?!0
tmp(\$\d+)?=&tmp(\$\d+)?!0
a=&tmp(\$\d+)?
tmp(\$\d+)?=&tmp(\$\d+)?
tmp(\$\d+)?=4
^EXIT=0$
^SIGNAL=0$
Expand Down
4 changes: 2 additions & 2 deletions regression/cbmc-cover/pointer-function-parameters/test.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ main.c
^\*\* 5 of 5 covered \(100\.0%\)$
^Test suite:$
^(tmp(\$\d+)?=[^,]*, a=\(\(signed int \*\)NULL\))|(a=\(\(signed int \*\)NULL\), tmp(\$\d+)?=[^,]*)$
^(a=&tmp(\$\d+)?!0@1, tmp(\$\d+)?=4)|(tmp(\$\d+)?=4, a=&tmp(\$\d+)?!0@1)$
^(a=&tmp(\$\d+)?!0@1, tmp(\$\d+)?=([012356789]\d*|4\d+|-\d+))|(tmp(\$\d+)?=([012356789]\d*|4\d+|-\d+), a=&tmp(\$\d+)?!0@1)$
^(a=&tmp(\$\d+)?, tmp(\$\d+)?=4)|(tmp(\$\d+)?=4, a=&tmp(\$\d+)?)$
^(a=&tmp(\$\d+)?, tmp(\$\d+)?=([012356789]\d*|4\d+|-\d+))|(tmp(\$\d+)?=([012356789]\d*|4\d+|-\d+), a=&tmp(\$\d+)?)$
^EXIT=0$
^SIGNAL=0$
--
Expand Down
94 changes: 74 additions & 20 deletions src/goto-programs/goto_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Author: Daniel Kroening
#include <util/merge_irep.h>
#include <util/namespace.h>
#include <util/range.h>
#include <util/ssa_expr.h>
#include <util/string_utils.h>
#include <util/symbol.h>

Expand Down Expand Up @@ -52,6 +53,34 @@ std::optional<symbol_exprt> goto_trace_stept::get_lhs_object() const
return get_object_rec(full_lhs);
}

/// Remove SSA index suffixes (like !0, @1, etc.) from symbol identifiers
/// in the expression tree. This is used to clean up expressions before
/// displaying them in traces.
static void remove_l0_l1(exprt &expr)
{
if(expr.id() == ID_symbol)
{
if(is_ssa_expr(expr))
expr = to_ssa_expr(expr).get_original_expr();
else
{
std::string identifier = id2string(to_symbol_expr(expr).get_identifier());

std::string::size_type l0_l1 = identifier.find_first_of("!@");
if(l0_l1 != std::string::npos)
{
identifier.resize(l0_l1);
to_symbol_expr(expr).set_identifier(identifier);
}
}

return;
}

Forall_operands(it, expr)
remove_l0_l1(*it);
}

void goto_tracet::output(
const class namespacet &ns,
std::ostream &out) const
Expand Down Expand Up @@ -106,9 +135,11 @@ void goto_trace_stept::output(

if(is_assignment())
{
out << " " << format(full_lhs)
<< " = " << format(full_lhs_value)
<< '\n';
exprt clean_lhs = full_lhs;
exprt clean_value = full_lhs_value;
remove_l0_l1(clean_lhs);
remove_l0_l1(clean_value);
out << " " << format(clean_lhs) << " = " << format(clean_value) << '\n';
}

if(!pc->source_location().is_nil())
Expand All @@ -127,7 +158,9 @@ void goto_trace_stept::output(
if(!comment.empty())
out << " " << comment << '\n';

out << " " << format(original_condition) << '\n';
exprt clean_condition = original_condition;
remove_l0_l1(clean_condition);
out << " " << format(clean_condition) << '\n';
out << '\n';
}
}
Expand Down Expand Up @@ -299,13 +332,20 @@ static void trace_value(
if(lhs_object.has_value())
identifier=lhs_object->get_identifier();

out << from_expr(ns, identifier, full_lhs) << '=';
// Create copies to clean up SSA suffixes
exprt clean_lhs = full_lhs;
remove_l0_l1(clean_lhs);

out << from_expr(ns, identifier, clean_lhs) << '=';

if(value.is_nil())
out << "(assignment removed)";
else
{
out << from_expr(ns, identifier, value);
exprt clean_value = value;
remove_l0_l1(clean_value);

out << from_expr(ns, identifier, clean_value);

// the binary representation
out << ' ' << messaget::faint << '('
Expand Down Expand Up @@ -414,8 +454,9 @@ void show_compact_goto_trace(

if(step.pc->is_assert())
{
out << " "
<< from_expr(ns, step.function_id, step.original_condition)
exprt clean_condition = step.original_condition;
remove_l0_l1(clean_condition);
out << " " << from_expr(ns, step.function_id, clean_condition)
<< '\n';
}

Expand Down Expand Up @@ -471,10 +512,13 @@ void show_compact_goto_trace(
}

{
auto arg_strings = make_range(step.function_arguments)
.map([&ns, &step](const exprt &arg) {
return from_expr(ns, step.function_id, arg);
});
auto arg_strings =
make_range(step.function_arguments)
.map([&ns, &step](const exprt &arg) {
exprt clean_arg = arg;
remove_l0_l1(clean_arg);
return from_expr(ns, step.function_id, clean_arg);
});

out << '(';
join_strings(out, arg_strings.begin(), arg_strings.end(), ", ");
Expand Down Expand Up @@ -542,8 +586,9 @@ void show_full_goto_trace(

if(step.pc->is_assert())
{
out << " "
<< from_expr(ns, step.function_id, step.original_condition)
exprt clean_condition = step.original_condition;
remove_l0_l1(clean_condition);
out << " " << from_expr(ns, step.function_id, clean_condition)
<< '\n';
}

Expand All @@ -560,8 +605,9 @@ void show_full_goto_trace(
if(!step.pc->source_location().is_nil())
out << " " << step.pc->source_location() << '\n';

out << " " << from_expr(ns, step.function_id, step.original_condition)
<< '\n';
exprt clean_condition = step.original_condition;
remove_l0_l1(clean_condition);
out << " " << from_expr(ns, step.function_id, clean_condition) << '\n';
}
break;

Expand Down Expand Up @@ -630,7 +676,9 @@ void show_full_goto_trace(
if(l_it!=step.io_args.begin())
out << ';';

out << ' ' << from_expr(ns, step.function_id, *l_it);
exprt clean_arg = *l_it;
remove_l0_l1(clean_arg);
out << ' ' << from_expr(ns, step.function_id, clean_arg);

// the binary representation
out << " (" << trace_numeric_value(*l_it, ns, options) << ')';
Expand All @@ -652,7 +700,9 @@ void show_full_goto_trace(
if(l_it!=step.io_args.begin())
out << ';';

out << ' ' << from_expr(ns, step.function_id, *l_it);
exprt clean_arg = *l_it;
remove_l0_l1(clean_arg);
out << ' ' << from_expr(ns, step.function_id, clean_arg);

// the binary representation
out << " (" << trace_numeric_value(*l_it, ns, options) << ')';
Expand All @@ -676,7 +726,9 @@ void show_full_goto_trace(
else
out << ", ";

out << from_expr(ns, step.function_id, arg);
exprt clean_arg = arg;
remove_l0_l1(clean_arg);
out << from_expr(ns, step.function_id, clean_arg);
}

out << ") (depth " << function_depth << ") ####\n";
Expand Down Expand Up @@ -770,7 +822,9 @@ static void show_goto_stack_trace(
else
out << ", ";

out << from_expr(ns, step.function_id, arg);
exprt clean_arg = arg;
remove_l0_l1(clean_arg);
out << from_expr(ns, step.function_id, clean_arg);
}

out << ')';
Expand Down
Loading