Merge pull request #3076 from diffblue/base-is-symbol-type

struct_typet::baset: no need for cast to symbol_type

Author: kroening

jbmc/src/java_bytecode/java_bytecode_language.cpp

@@ -312,8 +312,7 @@ static void infer_opaque_type_fields(
                 + "' (which was missing a field '" + id2string(component_name)
                 + "' referenced from method '" + id2string(method.name)
                 + "') should have an opaque superclass");
-            const symbol_typet &superclass_type =
-              to_symbol_type(class_type->bases().front().type());
+            const auto &superclass_type = class_type->bases().front().type();
             class_symbol_id = superclass_type.get_identifier();
             class_type = &to_class_type(ns.follow(superclass_type));
           }

src/goto-programs/class_hierarchy.cpp

@@ -47,7 +47,7 @@ void class_hierarchy_grapht::populate(const symbol_tablet &symbol_table)
 
       for(const auto &base : struct_type.bases())
       {
-        const irep_idt &parent = to_symbol_type(base.type()).get_identifier();
+        const irep_idt &parent = base.type().get_identifier();
         if(!parent.empty())
         {
           const auto parent_node_it = nodes_by_name.find(parent);
@@ -159,7 +159,7 @@ void class_hierarchyt::operator()(const symbol_tablet &symbol_table)
 
       for(const auto &base : struct_type.bases())
       {
-        const irep_idt &parent = to_symbol_type(base.type()).get_identifier();
+        const irep_idt &parent = base.type().get_identifier();
         if(parent.empty())
           continue;