Skip to content

Use non-trivial constructor of code_function_callt [blocks: #3800] #3885

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
Jan 23, 2019
Merged

Use non-trivial constructor of code_function_callt [blocks: #3800] #3885

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
30 changes: 14 additions & 16 deletions src/goto-instrument/goto_program2code.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,33 +315,31 @@ goto_programt::const_targett goto_program2codet::convert_assign_varargs(
const exprt this_va_list_expr=assign.lhs();
const exprt &r=skip_typecast(assign.rhs());

// we don't bother setting the type
code_function_callt f;
f.lhs().make_nil();

if(r.id()==ID_constant &&
(r.is_zero() || to_constant_expr(r).get_value()==ID_NULL))
{
f.function() = symbol_exprt("va_end", code_typet({}, empty_typet()));
f.arguments().push_back(this_va_list_expr);
code_function_callt f(
symbol_exprt("va_end", code_typet({}, empty_typet())),
{this_va_list_expr});
f.arguments().back().type().id(ID_gcc_builtin_va_list);

dest.add_to_operands(std::move(f));
}
else if(r.id()==ID_address_of)
{
f.function() = symbol_exprt("va_start", code_typet({}, empty_typet()));
f.arguments().push_back(this_va_list_expr);
f.arguments().back().type().id(ID_gcc_builtin_va_list);
f.arguments().push_back(to_address_of_expr(r).object());
code_function_callt f(
symbol_exprt("va_start", code_typet({}, empty_typet())),
{this_va_list_expr, to_address_of_expr(r).object()});
f.arguments().front().type().id(ID_gcc_builtin_va_list);

dest.add_to_operands(std::move(f));
}
else if(r.id()==ID_side_effect &&
to_side_effect_expr(r).get_statement()==ID_gcc_builtin_va_arg_next)
{
f.function() = symbol_exprt("va_arg", code_typet({}, empty_typet()));
f.arguments().push_back(this_va_list_expr);
code_function_callt f(
symbol_exprt("va_arg", code_typet({}, empty_typet())),
{this_va_list_expr});
f.arguments().back().type().id(ID_gcc_builtin_va_list);

side_effect_expr_function_callt type_of;
Expand Down Expand Up @@ -388,10 +386,10 @@ goto_programt::const_targett goto_program2codet::convert_assign_varargs(
}
else
{
f.function() = symbol_exprt("va_copy", code_typet({}, empty_typet()));
f.arguments().push_back(this_va_list_expr);
f.arguments().back().type().id(ID_gcc_builtin_va_list);
f.arguments().push_back(r);
code_function_callt f(
symbol_exprt("va_copy", code_typet({}, empty_typet())),
{this_va_list_expr, r});
f.arguments().front().type().id(ID_gcc_builtin_va_list);

dest.add_to_operands(std::move(f));
}
Expand Down