Skip to content

Make remove_virtual_function() consistent #1864

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 2 commits into from
Feb 23, 2018
Merged

Make remove_virtual_function() consistent #1864

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8192246
Make remove_virtual_function() consistent
Feb 19, 2018
c9f3ea4
Test casts in remove_virtual_function()
Feb 22, 2018
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
42 changes: 28 additions & 14 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 @@ -96,6 +96,28 @@ void remove_virtual_functionst::remove_virtual_function(
virtual_dispatch_fallback_actiont::CALL_LAST_FUNCTION);
}

/// Create a concrete function call to replace a virtual one
/// \param call [in/out]: the function call to update
/// \param function_symbol: the function to be called
/// \param ns: namespace
static void create_static_function_call(
code_function_callt &call,
const symbol_exprt &function_symbol,
const namespacet &ns)
{
call.function() = function_symbol;
// Cast the `this` pointer to the correct type for the new callee:
const auto &callee_type =
to_code_type(ns.lookup(function_symbol.get_identifier()).type);
const code_typet::parametert *this_param = callee_type.get_this();
INVARIANT(
this_param != nullptr,
"Virtual function callees must have a `this` argument");
typet need_type = this_param->type();
if(!type_eq(call.arguments()[0].type(), need_type, ns))
call.arguments()[0].make_typecast(need_type);
}

void remove_virtual_functionst::remove_virtual_function(
goto_programt &goto_program,
goto_programt::targett target,
Expand All @@ -121,8 +143,10 @@ void remove_virtual_functionst::remove_virtual_function(
if(functions.begin()->symbol_expr==symbol_exprt())
target->make_skip();
else
to_code_function_call(target->code).function()=
functions.begin()->symbol_expr;
{
create_static_function_call(
to_code_function_call(target->code), functions.front().symbol_expr, ns);
}
return;
}

Expand Down Expand Up @@ -187,18 +211,8 @@ void remove_virtual_functionst::remove_virtual_function(
{
// call function
t1->make_function_call(code);
auto &newcall=to_code_function_call(t1->code);
newcall.function()=fun.symbol_expr;
// Cast the `this` pointer to the correct type for the new callee:
const auto &callee_type=
to_code_type(ns.lookup(fun.symbol_expr.get_identifier()).type);
const code_typet::parametert *this_param = callee_type.get_this();
INVARIANT(
this_param != nullptr,
"Virtual function callees must have a `this` argument");
typet need_type=this_param->type();
if(!type_eq(newcall.arguments()[0].type(), need_type, ns))
newcall.arguments()[0].make_typecast(need_type);
create_static_function_call(
to_code_function_call(t1->code), fun.symbol_expr, ns);
}
else
{
Expand Down