Skip to content

Do not assign a non-ssa expression to object accessed via an ssa_exprt reference #4725

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
tautschnig merged 1 commit into from
May 31, 2019
Merged

Do not assign a non-ssa expression to object accessed via an ssa_exprt reference #4725

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
17 changes: 9 additions & 8 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 @@ -285,13 +285,10 @@ goto_symex_statet::rename(exprt expr, const namespacet &ns)
rename<level>(expr.type(), ssa.get_identifier(), ns);
ssa.update_type();

if(l2_thread_read_encoding(ssa, ns))
// renaming taken care of by l2_thread_encoding, or already at L2
if(l2_thread_read_encoding(ssa, ns) || !ssa.get_level_2().empty())
{
// renaming taken care of by l2_thread_encoding
}
else if(!ssa.get_level_2().empty())
{
// already at L2
return renamedt<exprt, level>(std::move(ssa));
}
else
{
Expand All @@ -300,11 +297,15 @@ goto_symex_statet::rename(exprt expr, const namespacet &ns)
auto p_it = propagation.find(ssa.get_identifier());

if(p_it.has_value())
expr = *p_it; // already L2
{
return renamedt<exprt, level>(*p_it); // already L2
}
else
{
ssa = set_indices<L2>(std::move(ssa), ns).get();
return renamedt<exprt, level>(std::move(ssa));
}
}
return renamedt<exprt, level>(std::move(ssa));
}
}
else if(expr.id()==ID_symbol)
Expand Down