Removed old method of specalising generics

We now use the select_pointer_type to specalise the type so we don't
need to convert all references.

Author: NlightNFotis

src/java_bytecode/generate_java_generic_type.cpp

@@ -126,46 +126,3 @@ irep_idt generate_java_generic_typet::build_generic_tag(
 
   return new_tag_buffer.str();
 }
-
-
-/// Activate the generic instantiation code.
-/// \param message_handler
-/// \param symbol_table The symbol table so far.
-void
-instantiate_generics(
-  message_handlert &message_handler,
-  symbol_tablet &symbol_table)
-{
-  generate_java_generic_typet instantiate_generic_type(message_handler);
-  // check out the symbols in the symbol table at this point to see if we
-  // have a a generic type in.
-  for(const auto &symbol : symbol_table.symbols)
-  {
-    if(symbol.second.type.id()==ID_struct)
-    {
-      auto symbol_struct=to_struct_type(symbol.second.type);
-      auto &components=symbol_struct.components();
-
-      for(const auto &component : components)
-      {
-        if(is_java_generic_type(component.type()))
-        {
-          const auto &type_vars=to_java_generic_type(component.type()).
-            generic_type_variables();
-
-          // Before we can instantiate a generic component, we need
-          // its type variables to be instantiated parameters
-          if(all_of(type_vars.cbegin(), type_vars.cend(),
-                    [](const typet &type)
-                    {
-                      return is_java_generic_inst_parameter(type);
-                    }))
-          {
-            instantiate_generic_type(
-              to_java_generic_type(component.type()), symbol_table);
-          }
-        }
-      }
-    }
-  }
-}

src/java_bytecode/generate_java_generic_type.h

@@ -31,8 +31,4 @@ class generate_java_generic_typet
   message_handlert &message_handler;
 };
 
-void instantiate_generics(
-  message_handlert &message_handler,
-  symbol_tablet &symbol_table);
-
 #endif // CPROVER_JAVA_BYTECODE_GENERATE_JAVA_GENERIC_TYPE_H

src/java_bytecode/java_bytecode_language.cpp

@@ -240,21 +240,8 @@ bool java_bytecode_languaget::typecheck(
     get_message_handler());
 
   // now typecheck all
-  bool res=java_bytecode_typecheck(
+  return java_bytecode_typecheck(
     symbol_table, get_message_handler(), string_refinement_enabled);
-  // NOTE (FOTIS): There is some unintuitive logic here, where
-  // java_bytecode_check will return TRUE if typechecking failed, and FALSE
-  // if everything went well...
-  if(res)
-  {
-    // there is no point in continuing to concretise
-    // the generic types if typechecking failed.
-    return res;
-  }
-
-  instantiate_generics(get_message_handler(), symbol_table);
-
-  return res;
 }
 
 bool java_bytecode_languaget::generate_support_functions(