Skip to content

Replace DFCC's set_hide by call to make_hidden #7681

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 1 commit into from
Apr 21, 2023
Merged

Replace DFCC's set_hide by call to make_hidden #7681

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
11 changes: 2 additions & 9 deletions src/goto-instrument/contracts/dynamic-frames/dfcc_library.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,8 @@ void dfcc_libraryt::load(std::set<irep_idt> &to_instrument)
inline_functions();

// hide all instructions in counter example traces
set_hide(true);
for(auto it : dfcc_fun_symbol)
goto_model.goto_functions.function_map.at(it.second.name).make_hidden();
}

optionalt<dfcc_funt> dfcc_libraryt::get_dfcc_fun(const irep_idt &id) const
Expand Down Expand Up @@ -512,14 +513,6 @@ void dfcc_libraryt::inhibit_front_end_builtins()
}
}

/// Sets the given hide flag on all instructions of all library functions
void dfcc_libraryt::set_hide(bool hide)
{
PRECONDITION(dfcc_libraryt::loaded);
for(auto it : dfcc_fun_symbol)
utils.set_hide(it.second.name, hide);
}

const symbolt &dfcc_libraryt::get_instrumented_functions_map_symbol()
{
const irep_idt map_name = "__dfcc_instrumented_functions";
Expand Down
3 changes: 0 additions & 3 deletions src/goto-instrument/contracts/dynamic-frames/dfcc_library.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,6 @@ class dfcc_libraryt
/// implementation.
void inhibit_front_end_builtins();

/// Sets the given hide flag on all instructions of all library functions
void set_hide(bool hide);

/// Adds "checked" pragmas to instructions of all library functions
/// instructions. By default checks are not disabled.
void disable_checks();
Expand Down
7 changes: 3 additions & 4 deletions src/goto-instrument/contracts/dynamic-frames/dfcc_spec_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void dfcc_spec_functionst::generate_havoc_function(
not_enough_arguments.empty(),
"not enough arguments when inlining " + id2string(havoc_function_id));

utils.set_hide(havoc_function_id, true);
goto_model.goto_functions.function_map.at(havoc_function_id).make_hidden();

goto_model.goto_functions.update();
}
Expand Down Expand Up @@ -278,7 +278,7 @@ void dfcc_spec_functionst::to_spec_assigns_function(
INVARIANT(
function_pointer_contracts.empty(),
"discovered function pointer contracts unexpectedly");
utils.set_hide(function_id, true);
goto_model.goto_functions.function_map.at(function_id).make_hidden();
}

void dfcc_spec_functionst::to_spec_assigns_instructions(
Expand Down Expand Up @@ -367,8 +367,7 @@ void dfcc_spec_functionst::to_spec_frees_function(
INVARIANT(
function_pointer_contracts.empty(),
"discovered function pointer contracts unexpectedly");

utils.set_hide(function_id, true);
goto_model.goto_functions.function_map.at(function_id).make_hidden();
}

void dfcc_spec_functionst::to_spec_frees_instructions(
Expand Down
4 changes: 2 additions & 2 deletions src/goto-instrument/contracts/dynamic-frames/dfcc_swap_and_wrap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ void dfcc_swap_and_wrapt::check_contract(
// extend the signature of the wrapper function with the write set parameter
utils.add_parameter(write_set_symbol, function_id);

utils.set_hide(wrapper_id, true);
goto_model.goto_functions.function_map.at(wrapper_id).make_hidden();

// instrument the wrapped function
instrument.instrument_wrapped_function(
Expand Down Expand Up @@ -305,7 +305,7 @@ void dfcc_swap_and_wrapt::replace_with_contract(
body.add(goto_programt::make_end_function(
utils.get_function_symbol(wrapper_id).location));

utils.set_hide(wrapper_id, true);
goto_model.goto_functions.function_map.at(wrapper_id).make_hidden();

// write the body to the GOTO function
goto_model.goto_functions.function_map.at(function_id).body.swap(body);
Expand Down
12 changes: 0 additions & 12 deletions src/goto-instrument/contracts/dynamic-frames/dfcc_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,18 +564,6 @@ bool dfcc_utilst::has_no_loops(const irep_idt &function_id)
goto_model.goto_functions.function_map.at(function_id).body);
}

void dfcc_utilst::set_hide(const irep_idt &function_id, bool hide)
{
auto &goto_function = goto_model.goto_functions.function_map.at(function_id);
if(goto_function.body_available())
{
Forall_goto_program_instructions(inst, goto_function.body)
{
inst->source_location_nonconst().set(ID_hide, hide);
}
}
}

void dfcc_utilst::inhibit_unused_functions(const irep_idt &start)
{
PRECONDITION_WITH_DIAGNOSTICS(false, "not yet implemented");
Expand Down
4 changes: 0 additions & 4 deletions src/goto-instrument/contracts/dynamic-frames/dfcc_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,6 @@ class dfcc_utilst
/// \returns True iff \p goto_program is loop free.
bool has_no_loops(const goto_programt &goto_program);

/// \brief Sets the given hide flag on all instructions of the function if it
/// exists.
void set_hide(const irep_idt &function_id, bool hide);

/// \brief Traverses the call tree from the given entry point to identify
/// functions symbols that are effectively called in the model,
/// Then goes over all functions of the model and turns the bodies of all
Expand Down