introduce union_tag type instead of symbol_type

Author: Daniel Kroening

src/ansi-c/c_typecheck_type.cpp

@@ -820,11 +820,21 @@ void c_typecheck_baset::typecheck_compound_type(struct_union_typet &type)
     }
   }
 
-  symbol_typet symbol_type(identifier);
-  symbol_type.add_source_location()=type.source_location();
-
   c_qualifierst original_qualifiers(type);
-  type.swap(symbol_type);
+
+  if(type.id() == ID_union)
+  {
+    union_tag_typet tag_type(identifier);
+    tag_type.add_source_location() = type.source_location();
+    type.swap(tag_type);
+  }
+  else
+  {
+    symbol_typet symbol_type(identifier);
+    symbol_type.add_source_location() = type.source_location();
+    type.swap(symbol_type);
+  }
+
   original_qualifiers.write(type);
 }
 

src/cpp/cpp_typecheck_compound_type.cpp

@@ -135,6 +135,7 @@ void cpp_typecheckt::typecheck_compound_type(
   cpp_scopet *dest_scope=nullptr;
   bool has_body=type.find(ID_body).is_not_nil();
   bool tag_only_declaration=type.get_bool(ID_C_tag_only_declaration);
+  bool is_union = type.id() == ID_union;
 
   if(!has_tag)
   {
@@ -263,10 +264,20 @@ void cpp_typecheckt::typecheck_compound_type(
     }
   }
 
-  // create type symbol
-  symbol_typet symbol_type(symbol_name);
-  qualifiers.write(symbol_type);
-  type.swap(symbol_type);
+  if(is_union)
+  {
+    // create union tag
+    union_tag_typet tag_type(symbol_name);
+    qualifiers.write(tag_type);
+    type.swap(tag_type);
+  }
+  else
+  {
+    // create type symbol
+    symbol_typet symbol_type(symbol_name);
+    qualifiers.write(symbol_type);
+    type.swap(symbol_type);
+  }
 }
 
 void cpp_typecheckt::typecheck_compound_declarator(