Skip to content

use instructiont::make_X in remove_virtual_functions #4189

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 14, 2019
Merged

use instructiont::make_X in remove_virtual_functions #4189

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
15 changes: 11 additions & 4 deletions src/goto-programs/remove_virtual_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,24 +247,31 @@ goto_programt::targett remove_virtual_functionst::remove_virtual_function(
// Only create one call sequence per possible target:
if(insertit.second)
{
goto_programt::targett t1=new_code_calls.add_instruction();
if(fun.symbol_expr.has_value())
{
// call function
*t1 = goto_programt::make_function_call(code, vcall_source_loc);
goto_programt::targett t1 = new_code_calls.add(
goto_programt::make_function_call(code, vcall_source_loc));

create_static_function_call(
t1->get_function_call(), *fun.symbol_expr, ns);

insertit.first->second = t1;
}
else
{
goto_programt::targett t1 = new_code_calls.add(
goto_programt::make_assertion(false_exprt(), vcall_source_loc));

// No definition for this type; shouldn't be possible...
*t1 = goto_programt::make_assertion(false_exprt(), vcall_source_loc);
t1->source_location.set_comment(
"cannot find calls for " +
id2string(code.function().get(ID_identifier)) + " dispatching " +
id2string(fun.class_id));

insertit.first->second = t1;
}
insertit.first->second=t1;

// goto final
new_code_calls.add(
goto_programt::make_goto(t_final, true_exprt(), vcall_source_loc));
Expand Down