@@ -342,9 +342,8 @@ goto_programt::const_targett goto_program2codet::convert_assign_varargs(
342
342
{this_va_list_expr});
343
343
f.arguments ().back ().type ().id (ID_gcc_builtin_va_list);
344
344
345
- side_effect_expr_function_callt type_of;
346
- type_of.function () =
347
- symbol_exprt (" __typeof__" , code_typet ({}, empty_typet ()));
345
+ side_effect_expr_function_callt type_of (
346
+ symbol_exprt (" __typeof__" , code_typet ({}, empty_typet ())), {}, typet{}, source_locationt{});
348
347
349
348
// if the return value is used, the next instruction will be assign
350
349
goto_programt::const_targett next=target;
@@ -486,9 +485,7 @@ goto_programt::const_targett goto_program2codet::convert_decl(
486
485
{
487
486
// could hack this by just erasing the first operand
488
487
const code_function_callt &f=to_code_function_call (next->code );
489
- side_effect_expr_function_callt call;
490
- call.function ()=f.function ();
491
- call.arguments ()=f.arguments ();
488
+ side_effect_expr_function_callt call (f.function (), f.arguments (), typet{}, source_locationt{});
492
489
d.copy_to_operands (call);
493
490
}
494
491
@@ -1920,10 +1917,7 @@ void goto_program2codet::cleanup_expr(exprt &expr, bool no_typecast)
1920
1917
symbol_exprt symbol_expr (symbol.name , symbol.type );
1921
1918
symbol_expr.add_source_location ()=expr.source_location ();
1922
1919
1923
- side_effect_expr_function_callt call;
1924
- call.add_source_location ()=expr.source_location ();
1925
- call.function ()=symbol_expr;
1926
- call.type ()=expr.type ();
1920
+ side_effect_expr_function_callt call (symbol_expr, {}, expr.type (), expr.source_location ());
1927
1921
1928
1922
expr.swap (call);
1929
1923
}
0 commit comments