Skip to content

bugfix: must do .update() after remove_returns #4147

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
Feb 10, 2019
Merged

bugfix: must do .update() after remove_returns #4147

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
13 changes: 13 additions & 0 deletions src/goto-instrument/goto_instrument_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,10 @@ int goto_instrument_parse_optionst::doit()
if(cmdline.isset("check-call-sequence"))
{
do_remove_returns();

// recalculate numbers, etc.
goto_model.goto_functions.update();

check_call_sequence(goto_model);
return CPROVER_EXIT_SUCCESS;
}
Expand Down Expand Up @@ -1443,6 +1447,9 @@ void goto_instrument_parse_optionst::instrument_goto_program()
{
do_indirect_call_and_rtti_removal();

// recalculate numbers, etc.
goto_model.goto_functions.update();

status() << "Performing a reachability slice" << eom;
if(cmdline.isset("property"))
reachability_slicer(goto_model, cmdline.get_values("property"));
Expand All @@ -1454,6 +1461,9 @@ void goto_instrument_parse_optionst::instrument_goto_program()
{
do_indirect_call_and_rtti_removal();

// recalculate numbers, etc.
goto_model.goto_functions.update();

status() << "Performing a function pointer reachability slice" << eom;
function_path_reachability_slicer(
goto_model, cmdline.get_comma_separated_values("fp-reachability-slice"));
Expand All @@ -1465,6 +1475,9 @@ void goto_instrument_parse_optionst::instrument_goto_program()
do_indirect_call_and_rtti_removal();
do_remove_returns();

// recalculate numbers, etc.
goto_model.goto_functions.update();

status() << "Performing a full slice" << eom;
if(cmdline.isset("property"))
property_slicer(goto_model, cmdline.get_values("property"));
Expand Down