Remove ID_gcc_builtin_va_list

We carry typedef names all the way now, there is no need for additional
annotations to preserve the typedef name of va_list for dump-c.

Author: tautschnig

src/ansi-c/expr2c.cpp

@@ -609,10 +609,6 @@ std::string expr2ct::convert_rec(
 
     return q+dest+d;
   }
-  else if(src.id()==ID_gcc_builtin_va_list)
-  {
-    return q+"__builtin_va_list"+d;
-  }
   else if(src.id()==ID_constructor ||
           src.id()==ID_destructor)
   {

src/goto-instrument/goto_program2code.cpp

@@ -122,24 +122,7 @@ void goto_program2codet::scan_for_varargs()
     }
 
   if(!va_list_expr.empty())
-  {
     system_headers.insert("stdarg.h");
-
-    code_typet &code_type=
-      to_code_type(symbol_table.get_writeable_ref(func_name).type);
-    code_typet::parameterst &parameters=code_type.parameters();
-
-    for(code_typet::parameterst::iterator
-        it2=parameters.begin();
-        it2!=parameters.end();
-        ++it2)
-    {
-      const symbol_exprt arg=
-        ns.lookup(it2->get_identifier()).symbol_expr();
-      if(va_list_expr.find(arg)!=va_list_expr.end())
-        it2->type().id(ID_gcc_builtin_va_list);
-    }
-  }
 }
 
 goto_programt::const_targett goto_program2codet::convert_instruction(
@@ -323,7 +306,6 @@ goto_programt::const_targett goto_program2codet::convert_assign_varargs(
     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(std::move(f));
   }
@@ -332,7 +314,6 @@ goto_programt::const_targett goto_program2codet::convert_assign_varargs(
     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(std::move(f));
   }
@@ -342,7 +323,6 @@ goto_programt::const_targett goto_program2codet::convert_assign_varargs(
     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);
 
     // we do not bother to set the correct types here, they are not relevant for
     // generating the correct dumped output
@@ -395,7 +375,6 @@ goto_programt::const_targett goto_program2codet::convert_assign_varargs(
     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(std::move(f));
   }
@@ -1461,9 +1440,6 @@ void goto_program2codet::cleanup_code(
 {
   if(code.get_statement()==ID_decl)
   {
-    if(va_list_expr.find(code.op0())!=va_list_expr.end())
-      code.op0().type().id(ID_gcc_builtin_va_list);
-
     if(code.operands().size()==2 &&
        code.op1().id()==ID_side_effect &&
        to_side_effect_expr(code.op1()).get_statement()==ID_function_call)

src/util/irep_ids.def

@@ -305,7 +305,6 @@ IREP_ID_ONE(clang_builtin_convertvector)
 IREP_ID_ONE(gcc_builtin_va_arg)
 IREP_ID_ONE(gcc_builtin_types_compatible_p)
 IREP_ID_ONE(gcc_builtin_va_arg_next)
-IREP_ID_ONE(gcc_builtin_va_list)
 IREP_ID_ONE(gcc_float16)
 IREP_ID_ONE(gcc_float32)
 IREP_ID_ONE(gcc_float32x)