Correcting generic parameters in bases for implicitly generic classes

If the superclass or interface uses a generic parameter inherited from
an outer class, make sure that the parameter for the base points to the
parameter of the outer class.

Author: svorenova

src/java_bytecode/java_bytecode_convert_class.cpp

@@ -709,6 +709,15 @@ static void find_and_replace_parameters(
       find_and_replace_parameters(argument, replacement_parameters);
     }
   }
+  else if(is_java_generic_base_type(type))
+  {
+    java_generic_base_typet &generic_base = to_java_generic_base_type(type);
+    std::vector<reference_typet> &gen_types = generic_base.generic_types();
+    for(auto &gen_type : gen_types)
+    {
+      find_and_replace_parameters(gen_type, replacement_parameters);
+    }
+  }
 }
 
 /// Checks if the class is implicitly generic, i.e., it is an inner class of
@@ -786,5 +795,11 @@ void mark_java_implicitly_generic_class_type(
       find_and_replace_parameters(
         field.type(), implicit_generic_type_parameters);
     }
+
+    for(auto &base : class_type.bases())
+    {
+      find_and_replace_parameters(
+        base.type(), implicit_generic_type_parameters);
+    }
   }
 }