Merge pull request #1877 from svorenova/specialized_generics_tg1419

[TG-1419] Specialization of generics

Author: Thomas Kiley

src/java_bytecode/Makefile

@@ -3,7 +3,7 @@ SRC = bytecode_info.cpp \
       ci_lazy_methods.cpp \
       ci_lazy_methods_needed.cpp \
       expr2java.cpp \
-      generic_arguments_name_builder.cpp \
+      generic_parameter_specialization_map_keys.cpp \
       jar_file.cpp \
       java_bytecode_convert_class.cpp \
       java_bytecode_convert_method.cpp \
@@ -29,7 +29,6 @@ SRC = bytecode_info.cpp \
       java_string_literals.cpp \
       java_types.cpp \
       java_utils.cpp \
-      generate_java_generic_type.cpp \
       mz_zip_archive.cpp \
       select_pointer_type.cpp \
       # Empty last line

src/java_bytecode/ci_lazy_methods.cpp

@@ -322,8 +322,10 @@ void ci_lazy_methodst::initialize_all_needed_classes_from_pointer(
 {
   initialize_needed_classes_from_pointer(pointer_type, ns, needed_lazy_methods);
 
-  const pointer_typet &subbed_pointer_type=
-    pointer_type_selector.convert_pointer_type(pointer_type, ns);
+  // TODO we should be passing here a map that maps generic parameters
+  // to concrete types in the current context TG-2664
+  const pointer_typet &subbed_pointer_type =
+    pointer_type_selector.convert_pointer_type(pointer_type, {}, ns);
 
   if(subbed_pointer_type!=pointer_type)
   {