base types are symbol_typet

Author: Daniel Kroening

jbmc/src/java_bytecode/java_static_initializers.cpp

@@ -203,7 +203,7 @@ static void clinit_wrapper_do_recursive_calls(
   const symbolt &class_symbol = symbol_table.lookup_ref(class_name);
   for(const auto &base : to_class_type(class_symbol.type).bases())
   {
-    const auto base_name = to_symbol_type(base.type()).get_identifier();
+    const auto base_name = base.type().get_identifier();
     irep_idt base_init_routine = clinit_wrapper_name(base_name);
     auto findit = symbol_table.symbols.find(base_init_routine);
     if(findit == symbol_table.symbols.end())
@@ -286,7 +286,7 @@ static bool needs_clinit_wrapper(
   for(const class_typet::baset &base : class_type.bases())
   {
     if(symbol_table.has_symbol(
-         clinit_wrapper_name(to_symbol_type(base.type()).get_identifier())))
+         clinit_wrapper_name(base.type().get_identifier())))
     {
       return true;
     }

src/cpp/cpp_typecheck_bases.cpp

@@ -150,7 +150,7 @@ void cpp_typecheckt::add_base_components(
     else if(access==ID_protected && sub_access!=ID_private)
       sub_access=ID_protected;
 
-    const symbolt &symb = lookup(to_symbol_type(b.type()).get_identifier());
+    const symbolt &symb = lookup(b.type());
 
     const bool is_virtual = b.get_bool(ID_virtual);
 

src/cpp/cpp_typecheck_compound_type.cpp

@@ -1646,8 +1646,7 @@ void cpp_typecheckt::get_bases(
   {
     DATA_INVARIANT(b.id() == ID_base, "base class expression expected");
 
-    const struct_typet &base =
-      to_struct_type(lookup(to_symbol_type(b.type()).get_identifier()).type);
+    const struct_typet &base = to_struct_type(lookup(b.type()).type);
 
     set_bases.insert(base.get(ID_name));
     get_bases(base, set_bases);
@@ -1665,8 +1664,7 @@ void cpp_typecheckt::get_virtual_bases(
   {
     DATA_INVARIANT(b.id() == ID_base, "base class expression expected");
 
-    const struct_typet &base =
-      to_struct_type(lookup(to_symbol_type(b.type()).get_identifier()).type);
+    const struct_typet &base = to_struct_type(lookup(b.type()).type);
 
     if(b.get_bool(ID_virtual))
       vbases.push_back(base.get(ID_name));

src/cpp/cpp_typecheck_constructor.cpp

@@ -190,7 +190,7 @@ void cpp_typecheckt::default_cpctor(
   {
     DATA_INVARIANT(b.id() == ID_base, "base class expression expected");
 
-    const symbolt &parsymb = lookup(to_symbol_type(b.type()).get_identifier());
+    const symbolt &parsymb = lookup(b.type());
 
     if(cpp_is_pod(parsymb.type))
       copy_parent(source_location, parsymb.base_name, param_identifier, block);
@@ -359,7 +359,7 @@ void cpp_typecheckt::default_assignop_value(
   {
     DATA_INVARIANT(b.id() == ID_base, "base class expression expected");
 
-    const symbolt &symb = lookup(to_symbol_type(b.type()).get_identifier());
+    const symbolt &symb = lookup(b.type());
 
     copy_parent(source_location, symb.base_name, arg_name, block);
   }
@@ -595,8 +595,7 @@ void cpp_typecheckt::full_member_initialization(
     {
       DATA_INVARIANT(b.id() == ID_base, "base class expression expected");
 
-      const symbolt &ctorsymb =
-        lookup(to_symbol_type(b.type()).get_identifier());
+      const symbolt &ctorsymb = lookup(b.type());
 
       if(cpp_is_pod(ctorsymb.type))
         continue;

src/cpp/cpp_typecheck_destructor.cpp

@@ -141,7 +141,7 @@ codet cpp_typecheckt::dtor(const symbolt &symbol)
       bit++)
   {
     DATA_INVARIANT(bit->id() == ID_base, "base class expression expected");
-    const symbolt &psymb = lookup(to_symbol_type(bit->type()).get_identifier());
+    const symbolt &psymb = lookup(bit->type());
 
     symbol_exprt this_ptr(ID_this, pointer_type(symbol.type));
     dereference_exprt object(this_ptr, psymb.type);

src/cpp/cpp_typecheck_expr.cpp

@@ -35,7 +35,7 @@ bool cpp_typecheckt::find_parent(
 {
   for(const auto &b : to_struct_type(symb.type).bases())
   {
-    const irep_idt &id = to_symbol_type(b.type()).get_identifier();
+    const irep_idt &id = b.type().get_identifier();
     if(lookup(id).base_name == base_name)
     {
       identifier = id;

src/util/std_types.h

@@ -291,7 +291,17 @@ class struct_typet:public struct_union_typet
   class baset : public exprt
   {
   public:
-    explicit baset(const typet &base) : exprt(ID_base, base)
+    symbol_typet &type()
+    {
+      return to_symbol_type(exprt::type());
+    }
+
+    const symbol_typet &type() const
+    {
+      return to_symbol_type(exprt::type());
+    }
+
+    explicit baset(const symbol_typet &base) : exprt(ID_base, base)
     {
     }
   };