Skip to content

Make set_indices a template #4333

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
Mar 6, 2019
Merged

Make set_indices a template #4333

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
683495f
Move set_l*_indices definition before first call
romainbrenguier Mar 5, 2019
03f5c16
Make set_indices a template
romainbrenguier Mar 5, 2019
78cf428
Simplify rename_ssa using set_indices template
romainbrenguier Mar 6, 2019
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
65 changes: 31 additions & 34 deletions src/goto-symex/goto_symex_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,27 @@ class goto_symex_is_constantt : public is_constantt
}
};

template <>
renamedt<ssa_exprt, L0>
goto_symex_statet::set_indices<L0>(ssa_exprt ssa_expr, const namespacet &ns)
{
return level0(std::move(ssa_expr), ns, source.thread_nr);
}

template <>
renamedt<ssa_exprt, L1>
goto_symex_statet::set_indices<L1>(ssa_exprt ssa_expr, const namespacet &ns)
{
return level1(level0(std::move(ssa_expr), ns, source.thread_nr));
}

template <>
renamedt<ssa_exprt, L2>
goto_symex_statet::set_indices<L2>(ssa_exprt ssa_expr, const namespacet &ns)
{
return level2(level1(level0(std::move(ssa_expr), ns, source.thread_nr)));
}

void goto_symex_statet::assignment(
ssa_exprt &lhs, // L0/L1
const exprt &rhs, // L2
Expand Down Expand Up @@ -188,7 +209,7 @@ void goto_symex_statet::assignment(
const auto level2_it =
level2.current_names.emplace(l1_identifier, std::make_pair(lhs, 0)).first;
symex_renaming_levelt::increase_counter(level2_it);
lhs = set_l2_indices(std::move(lhs), ns).get();
lhs = set_indices<L2>(std::move(lhs), ns).get();

// in case we happen to be multi-threaded, record the memory access
bool is_shared=l2_thread_write_encoding(lhs, ns);
Expand Down Expand Up @@ -235,37 +256,13 @@ void goto_symex_statet::assignment(
#endif
}

renamedt<ssa_exprt, L0>
goto_symex_statet::set_l0_indices(ssa_exprt ssa_expr, const namespacet &ns)
{
return level0(std::move(ssa_expr), ns, source.thread_nr);
}

renamedt<ssa_exprt, L1>
goto_symex_statet::set_l1_indices(ssa_exprt ssa_expr, const namespacet &ns)
{
return level1(level0(std::move(ssa_expr), ns, source.thread_nr));
}

renamedt<ssa_exprt, L2>
goto_symex_statet::set_l2_indices(ssa_exprt ssa_expr, const namespacet &ns)
{
return level2(level1(level0(std::move(ssa_expr), ns, source.thread_nr)));
}

template <levelt level>
ssa_exprt goto_symex_statet::rename_ssa(ssa_exprt ssa, const namespacet &ns)
{
static_assert(
level == L0 || level == L1,
"rename_ssa can only be used for levels L0 and L1");
if(level == L0)
ssa = set_l0_indices(std::move(ssa), ns).get();
else if(level == L1)
ssa = set_l1_indices(std::move(ssa), ns).get();
else
UNREACHABLE;

ssa = set_indices<level>(std::move(ssa), ns).get();
rename<level>(ssa.type(), ssa.get_identifier(), ns);
ssa.update_type();
return ssa;
Expand Down Expand Up @@ -297,7 +294,7 @@ exprt goto_symex_statet::rename(exprt expr, const namespacet &ns)
}
else if(level==L2)
{
ssa = set_l1_indices(std::move(ssa), ns).get();
ssa = set_indices<L1>(std::move(ssa), ns).get();
rename<level>(expr.type(), ssa.get_identifier(), ns);
ssa.update_type();

Expand All @@ -318,7 +315,7 @@ exprt goto_symex_statet::rename(exprt expr, const namespacet &ns)
if(p_it != propagation.end())
expr=p_it->second; // already L2
else
ssa = set_l2_indices(std::move(ssa), ns).get();
ssa = set_indices<L2>(std::move(ssa), ns).get();
}
}
}
Expand Down Expand Up @@ -432,7 +429,7 @@ bool goto_symex_statet::l2_thread_read_encoding(
if(!no_write.op().is_false())
cond |= guardt{no_write.op()};

const renamedt<ssa_exprt, L2> l2_true_case = set_l2_indices(ssa_l1, ns);
const renamedt<ssa_exprt, L2> l2_true_case = set_indices<L2>(ssa_l1, ns);

if(a_s_read.second.empty())
{
Expand All @@ -442,7 +439,7 @@ bool goto_symex_statet::l2_thread_read_encoding(
symex_renaming_levelt::increase_counter(level2_it);
a_s_read.first=level2.current_count(l1_identifier);
}
const renamedt<ssa_exprt, L2> l2_false_case = set_l2_indices(ssa_l1, ns);
const renamedt<ssa_exprt, L2> l2_false_case = set_indices<L2>(ssa_l1, ns);

exprt tmp;
if(cond.is_false())
Expand All @@ -464,7 +461,7 @@ bool goto_symex_statet::l2_thread_read_encoding(
source,
symex_targett::assignment_typet::PHI);

expr = set_l2_indices(std::move(ssa_l1), ns).get();
expr = set_indices<L2>(std::move(ssa_l1), ns).get();

a_s_read.second.push_back(guard);
if(!no_write.op().is_false())
Expand All @@ -480,13 +477,13 @@ bool goto_symex_statet::l2_thread_read_encoding(
// No event and no fresh index, but avoid constant propagation
if(!record_events)
{
expr = set_l2_indices(std::move(ssa_l1), ns).get();
expr = set_indices<L2>(std::move(ssa_l1), ns).get();
return true;
}

// produce a fresh L2 name
symex_renaming_levelt::increase_counter(level2_it);
expr = set_l2_indices(std::move(ssa_l1), ns).get();
expr = set_indices<L2>(std::move(ssa_l1), ns).get();

// and record that
INVARIANT_STRUCTURED(
Expand Down Expand Up @@ -543,7 +540,7 @@ void goto_symex_statet::rename_address(exprt &expr, const namespacet &ns)
ssa_exprt &ssa=to_ssa_expr(expr);

// only do L1!
ssa = set_l1_indices(std::move(ssa), ns).get();
ssa = set_indices<L1>(std::move(ssa), ns).get();

rename<level>(expr.type(), ssa.get_identifier(), ns);
ssa.update_type();
Expand Down
11 changes: 3 additions & 8 deletions src/goto-symex/goto_symex_state.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,9 @@ class goto_symex_statet final : public goto_statet
template <levelt>
void rename_address(exprt &expr, const namespacet &ns);

/// Update level 0 values.
renamedt<ssa_exprt, L0> set_l0_indices(ssa_exprt expr, const namespacet &ns);

/// Update level 0 and 1 values.
renamedt<ssa_exprt, L1> set_l1_indices(ssa_exprt expr, const namespacet &ns);

/// Update level 0, 1 and 2 values.
renamedt<ssa_exprt, L2> set_l2_indices(ssa_exprt expr, const namespacet &ns);
/// Update values up to \c level.
template <levelt level>
renamedt<ssa_exprt, level> set_indices(ssa_exprt expr, const namespacet &ns);

// this maps L1 names to (L2) types
typedef std::unordered_map<irep_idt, typet> l1_typest;
Expand Down