c++: use struct_tag instead of symbol_type

Author: Daniel Kroening

src/cpp/cpp_typecheck_bases.cpp

@@ -43,6 +43,9 @@ void cpp_typecheckt::typecheck_compound_bases(struct_typet &type)
     // elaborate any class template instances given as bases
     elaborate_class_template(base_symbol_expr.type());
 
+    if(base_symbol_expr.type().id() == ID_struct_tag)
+      base_symbol_expr.type().id(ID_symbol_type);
+
     if(base_symbol_expr.type().id() != ID_symbol_type)
     {
       error().source_location=name.source_location();

src/cpp/cpp_typecheck_compound_type.cpp

@@ -273,10 +273,10 @@ void cpp_typecheckt::typecheck_compound_type(
   }
   else
   {
-    // create type symbol
-    symbol_typet symbol_type(symbol_name);
-    qualifiers.write(symbol_type);
-    type.swap(symbol_type);
+    // create struct tag
+    struct_tag_typet tag_type(symbol_name);
+    qualifiers.write(tag_type);
+    type.swap(tag_type);
   }
 }
 
@@ -569,7 +569,7 @@ void cpp_typecheckt::typecheck_compound_declarator(
         // add a virtual-table pointer
         struct_typet::componentt compo(
           id2string(symbol.name) + "::@vtable_pointer",
-          pointer_type(symbol_typet(vt_name)));
+          pointer_type(struct_tag_typet(vt_name)));
         compo.set_base_name("@vtable_pointer");
         compo.set_pretty_name(id2string(symbol.base_name) + "@vtable_pointer");
         compo.set(ID_is_vtptr, true);
@@ -1356,7 +1356,12 @@ void cpp_typecheckt::add_this_to_method_type(
   parameter.set_base_name(ID_this);
   parameter.set_this();
 
-  typet subtype = symbol_typet(compound_symbol.name);
+  typet subtype;
+
+  if(compound_symbol.type.id() == ID_union)
+    subtype = union_tag_typet(compound_symbol.name);
+  else
+    subtype = struct_tag_typet(compound_symbol.name);
 
   if(has_const(method_qualifier))
     subtype.set(ID_C_constant, true);
@@ -1452,7 +1457,7 @@ void cpp_typecheckt::convert_anon_struct_union_member(
   if(struct_union_symbol.type.id() == ID_union)
     compound_type = union_tag_typet(struct_union_symbol.name);
   else
-    compound_type = symbol_typet(struct_union_symbol.name);
+    compound_type = struct_tag_typet(struct_union_symbol.name);
 
   struct_typet::componentt component(identifier, compound_type);
   component.set_access(access);

src/cpp/cpp_typecheck_expr.cpp

@@ -120,7 +120,7 @@ void cpp_typecheckt::typecheck_expr_main(exprt &expr)
   {
     // these appear to have type "struct _GUID"
     // and they are lvalues!
-    expr.type()=symbol_typet("tag-_GUID");
+    expr.type() = struct_tag_typet("tag-_GUID");
     follow(expr.type());
     expr.set(ID_C_lvalue, true);
   }
@@ -717,7 +717,7 @@ void cpp_typecheckt::typecheck_expr_address_of(exprt &expr)
     if(args.size() > 0 && args[0].get(ID_C_base_name)==ID_this)
     {
       // it's a pointer to member function
-      const symbol_typet symbol(code_type.get(ID_C_member_name));
+      const struct_tag_typet symbol(code_type.get(ID_C_member_name));
       expr.op0().type().add("to-member")=symbol;
 
       if(code_type.get_bool(ID_C_is_virtual))
@@ -980,11 +980,11 @@ void cpp_typecheckt::typecheck_expr_explicit_constructor_call(exprt &expr)
   {
     assert(expr.type().id()==ID_struct);
 
-    symbol_typet symb(expr.type().get(ID_name));
-    symb.add_source_location()=expr.source_location();
+    struct_tag_typet tag(expr.type().get(ID_name));
+    tag.add_source_location() = expr.source_location();
 
     exprt e=expr;
-    new_temporary(e.source_location(), symb, e.operands(), expr);
+    new_temporary(e.source_location(), tag, e.operands(), expr);
   }
 }
 

src/cpp/cpp_typecheck_resolve.cpp

@@ -162,6 +162,10 @@ void cpp_typecheck_resolvet::remove_duplicates(
       id = to_symbol_expr(old_id).get_identifier();
     else if(old_id.id() == ID_type && old_id.type().id() == ID_symbol_type)
       id = to_symbol_type(old_id.type()).get_identifier();
+    else if(old_id.id() == ID_type && old_id.type().id() == ID_struct_tag)
+      id = to_struct_tag_type(old_id.type()).get_identifier();
+    else if(old_id.id() == ID_type && old_id.type().id() == ID_union_tag)
+      id = to_union_tag_type(old_id.type()).get_identifier();
 
     if(id=="")
     {

src/cpp/cpp_typecheck_virtual_table.cpp

@@ -74,14 +74,14 @@ void cpp_typecheckt::do_virtual_table(const symbolt &symbol)
     vt_symb_var.mode=ID_cpp;
     vt_symb_var.module=module;
     vt_symb_var.location=vt_symb_type.location;
-    vt_symb_var.type=symbol_typet(vt_symb_type.name);
+    vt_symb_var.type = struct_tag_typet(vt_symb_type.name);
     vt_symb_var.is_lvalue=true;
     vt_symb_var.is_static_lifetime=true;
 
     // do the values
     const struct_typet &vt_type=to_struct_type(vt_symb_type.type);
 
-    struct_exprt values(symbol_typet(vt_symb_type.name));
+    struct_exprt values(struct_tag_typet(vt_symb_type.name));
 
     for(const auto &compo : vt_type.components())
     {