Skip to content
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

SYNTHESIZER: Use only symbols from the original goto as terminals #7970

Merged
merged 1 commit into from
Oct 20, 2023
Merged

SYNTHESIZER: Use only symbols from the original goto as terminals #7970

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
18 changes: 18 additions & 0 deletions src/goto-synthesizer/enumerative_loop_contracts_synthesizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ void replace_tmp_post(

std::vector<exprt> construct_terminals(const std::set<symbol_exprt> &symbols)
{
// Construct a vector of terminal expressions.
// Terminals include:
// 1: scalar type variables and their loop_entry version.
// 2: offsets of pointers and loop_entry of pointers.
// 3: constants 0 and 1.

std::vector<exprt> result;
for(const auto &e : symbols)
{
Expand Down Expand Up @@ -244,6 +250,18 @@ enumerative_loop_contracts_synthesizert::compute_dependent_symbols(
for(const auto &e : live_vars)
find_symbols(e, result);

// Erase all variables added during loop transformations---they are not in
// the original symbol table.
for(auto it = result.begin(); it != result.end();)
{
if(original_symbol_table.lookup(it->get_identifier()) == nullptr)
{
it = result.erase(it);
}
else
it++;
}

return result;
}

Expand Down
6 changes: 5 additions & 1 deletion src/goto-synthesizer/enumerative_loop_contracts_synthesizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ class enumerative_loop_contracts_synthesizert
messaget &log)
: loop_contracts_synthesizer_baset(goto_model, log),
options(options),
ns(goto_model.symbol_table)
ns(goto_model.symbol_table),
original_symbol_table(goto_model.symbol_table)
{
}

Expand Down Expand Up @@ -97,6 +98,9 @@ class enumerative_loop_contracts_synthesizert

/// Map from tmp_post variables to their original variables.
std::unordered_map<exprt, exprt, irep_hash> tmp_post_map;

/// Symbol table of the input goto model
const symbol_tablet original_symbol_table;
};

// NOLINTNEXTLINE(whitespace/line_length)
Expand Down