Fix dump-c output involving typedef names

Follow-up to 99067de, which made expr2c prefer typedef names over
original type expressions.

Author: tautschnig

regression/goto-instrument/typedef1/main.c

@@ -0,0 +1,32 @@
+typedef long int off_t;
+typedef signed char smallint;
+
+typedef struct dumper_t dumper_t;
+typedef struct FS FS;
+
+dumper_t * alloc_dumper(void);
+
+typedef struct dumper_t
+{
+  off_t dump_skip;
+  signed int dump_length;
+  smallint dump_vflag;
+  FS *fshead;
+} dumper_t;
+
+
+typedef struct FS
+{
+  struct FS *nextfs;
+  signed int bcnt;
+} FS;
+
+dumper_t * alloc_dumper(void)
+{
+  return (void*) 0;
+}
+
+int main() {
+	alloc_dumper();
+	return 0;
+}

regression/goto-instrument/typedef1/test.desc

@@ -0,0 +1,7 @@
+CORE
+main.c
+--dump-c
+^EXIT=0$
+^SIGNAL=0$
+--
+^warning: ignoring

src/goto-instrument/dump_c.cpp

@@ -285,6 +285,12 @@ void dump_ct::operator()(std::ostream &os)
     os << std::endl;
   }
 
+  // global typedefs
+  for(const auto &td : typedef_map)
+    os << td.second << std::endl;
+  if(!typedef_map.empty())
+    os << std::endl;
+
   if(!func_decl_stream.str().empty())
     os << func_decl_stream.str() << std::endl;
   if(!compound_body_stream.str().empty())
@@ -519,6 +525,8 @@ void dump_ct::convert_compound(
       assert(false);
 
     struct_body << ";" << std::endl;
+
+    collect_typedefs(comp.type());
   }
 
   os << type_to_string(unresolved);
@@ -915,6 +923,54 @@ void dump_ct::cleanup_decl(
 
 /*******************************************************************\
 
+Function: dump_ct::collect_typedefs
+
+Inputs:
+
+Outputs:
+
+Purpose:
+
+\*******************************************************************/
+
+void dump_ct::collect_typedefs(const typet &type)
+{
+  if(type.id()==ID_code)
+  {
+    const code_typet &code_type=to_code_type(type);
+
+    collect_typedefs(code_type.return_type());
+    for(const auto &param : code_type.parameters())
+      collect_typedefs(param.type());
+  }
+  else if(type.id()==ID_pointer)
+  {
+    collect_typedefs(type.subtype());
+  }
+
+  const irep_idt &typedef_str=type.get(ID_C_typedef);
+
+  if(!typedef_str.empty())
+  {
+    std::pair<typedef_mapt::iterator, bool> entry=
+      typedef_map.insert({typedef_str, ""});
+
+    if(entry.second)
+    {
+      typet t=type;
+      t.remove(ID_C_typedef);
+
+      std::ostringstream oss;
+      oss << "typedef " << type_to_string(t) << " "
+          << typedef_str << ';';
+
+      entry.first->second=oss.str();
+    }
+  }
+}
+
+/*******************************************************************\
+
 Function: dump_ct::convert_global_variables
 
 Inputs:
@@ -935,6 +991,9 @@ void dump_ct::convert_global_variable(
       !converted_global.insert(symbol.name).second)
     return;
 
+  if(func.empty() || symbol.is_extern)
+    collect_typedefs(symbol.type);
+
   code_declt d(symbol.symbol_expr());
 
   find_symbols_sett syms;
@@ -1062,6 +1121,8 @@ void dump_ct::convert_function_declaration(
   if(symbol.name!=goto_functionst::entry_point() &&
      symbol.name!=ID_main)
   {
+    collect_typedefs(symbol.type);
+
     os_decl << "// " << symbol.name << std::endl;
     os_decl << "// " << symbol.location << std::endl;
     os_decl << make_decl(symbol.name, symbol.type) << ";" << std::endl;

src/goto-instrument/dump_c_class.h

@@ -59,6 +59,9 @@ class dump_ct
     declared_enum_constants_mapt;
   declared_enum_constants_mapt declared_enum_constants;
 
+  typedef std::map<irep_idt, std::string> typedef_mapt;
+  typedef_mapt typedef_map;
+
   void init_system_library_map();
 
   std::string type_to_string(const typet &type);
@@ -85,6 +88,8 @@ class dump_ct
     return d_str.substr(0, d_str.size()-1);
   }
 
+  void collect_typedefs(const typet &type);
+
   void convert_compound_declaration(
       const symbolt &symbol,
       std::ostream &os_body);

src/goto-instrument/goto_program2code.cpp

@@ -1818,6 +1818,8 @@ void goto_program2codet::cleanup_code(
 
     add_local_types(code.op0().type());
 
+    code.op0().type().remove(ID_C_typedef);
+
     return;
   }
   else if(code.get_statement()==ID_function_call)