Make componentt::{base,pretty}_name comments

The only semantically relevant name information is the ID_name entry.
Two components should not be considered different when they only differ
in their base_name or pretty_name. Thus, use ID_C_base_name and
ID_C_pretty_name, respectively, to store these.

The goto binary version is incremented as goto binaries compiled before
this patch are incompatible with the changes introduced here.

Fixes: #5818

Author: tautschnig

regression/ansi-c/arch_flags_mcpu_bad/object.intel

@@ -11,7 +11,7 @@ This tests the -mcpu=cortex=a15 flag that should activate ARM-32 mode.
 The object file 'object.intel' was compiled from 'source.c' with goto-cc
 on a 64-bit platform:
 
-  goto-cc -c source.c
+  goto-cc -c source.c -o object.intel
 
 preproc.i is already pre-processed so that it can be linked in without
 needing to invoke a pre-processor from a cross-compile toolchain on your

regression/ansi-c/arch_flags_mcpu_bad/test.desc

@@ -11,7 +11,7 @@ This tests the -mthumb flag that should activate ARM-32 mode. The object
 file 'object.intel' was compiled from 'source.c' with goto-cc on a
 64-bit platform:
 
-  goto-cc -c source.c
+  goto-cc -c source.c -o object.intel
 
 preproc.i is already pre-processed so that it can be linked in without
 needing to invoke a pre-processor from a cross-compile toolchain on your

regression/ansi-c/arch_flags_mcpu_good/object.arm

@@ -1576,13 +1576,13 @@ std::string expr2ct::convert_member(
 
   if(!component_name.empty())
   {
-    const exprt &comp_expr = struct_union_type.get_component(component_name);
+    const auto &comp_expr = struct_union_type.get_component(component_name);
 
     if(comp_expr.is_nil())
       return convert_norep(src, precedence);
 
-    if(!comp_expr.get(ID_pretty_name).empty())
-      dest+=comp_expr.get_string(ID_pretty_name);
+    if(!comp_expr.get_pretty_name().empty())
+      dest += id2string(comp_expr.get_pretty_name());
     else
       dest+=id2string(component_name);
 
@@ -1594,9 +1594,12 @@ std::string expr2ct::convert_member(
   if(n>=struct_union_type.components().size())
     return convert_norep(src, precedence);
 
-  const exprt &comp_expr = struct_union_type.components()[n];
+  const auto &comp_expr = struct_union_type.components()[n];
 
-  dest+=comp_expr.get_string(ID_pretty_name);
+  if(!comp_expr.get_pretty_name().empty())
+    dest += id2string(comp_expr.get_pretty_name());
+  else
+    dest += id2string(comp_expr.get_name());
 
   return dest;
 }

regression/ansi-c/arch_flags_mthumb_bad/object.intel

@@ -94,7 +94,10 @@ std::string expr2cppt::convert_struct(
 
       dest+=sep;
       dest+='.';
-      dest += c.get_string(ID_pretty_name);
+      if(!c.get_pretty_name().empty())
+        dest += id2string(c.get_pretty_name());
+      else
+        dest += id2string(c.get_name());
       dest+='=';
       dest+=tmp;
     }

regression/ansi-c/arch_flags_mthumb_bad/test.desc

@@ -81,8 +81,8 @@ void print_struct_alignment_problems(
                   << symbol_pair.second.location << '\n';
             }
 
-            out << "members " << it_mem->get_pretty_name() << " and "
-                << it_next->get_pretty_name() << " might interfere\n";
+            out << "members " << it_mem->get_name() << " and "
+                << it_next->get_name() << " might interfere\n";
           }
         }
       }

regression/ansi-c/arch_flags_mthumb_good/object.arm

@@ -12,7 +12,7 @@ Author: CM Wintersteiger
 #ifndef CPROVER_GOTO_PROGRAMS_WRITE_GOTO_BINARY_H
 #define CPROVER_GOTO_PROGRAMS_WRITE_GOTO_BINARY_H
 
-#define GOTO_BINARY_VERSION 5
+#define GOTO_BINARY_VERSION 6
 
 #include <iosfwd>
 #include <string>