[GR-35118] Avoid duplication of Class.arrayType() due to covariant return type.

PullRequest: graal/10421

Author: Christian Wimmer

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java

@@ -91,7 +91,7 @@
 @SuppressWarnings({"static-method", "serial"})
 @SuppressFBWarnings(value = "Se", justification = "DynamicHub must implement Serializable for compatibility with java.lang.Class, not because of actual serialization")
 public final class DynamicHub implements JavaKind.FormatWithToString, AnnotatedElement, java.lang.reflect.Type, GenericDeclaration, Serializable,
-                Target_java_lang_invoke_TypeDescriptor_OfField<DynamicHub>, Target_java_lang_constant_Constable {
+                Target_java_lang_invoke_TypeDescriptor_OfField, Target_java_lang_constant_Constable {
 
     /** Marker value for {@link #classLoader}. */
     static final Object NO_CLASS_LOADER = new Object();
@@ -1627,18 +1627,18 @@ interface Target_java_lang_invoke_TypeDescriptor {
 
 @Substitute
 @TargetClass(className = "java.lang.invoke.TypeDescriptor", innerClass = "OfField", onlyWith = JDK17OrLater.class)
-interface Target_java_lang_invoke_TypeDescriptor_OfField<F extends Target_java_lang_invoke_TypeDescriptor_OfField<F>> extends Target_java_lang_invoke_TypeDescriptor {
+interface Target_java_lang_invoke_TypeDescriptor_OfField extends Target_java_lang_invoke_TypeDescriptor {
     @KeepOriginal
     boolean isArray();
 
     @KeepOriginal
     boolean isPrimitive();
 
     @KeepOriginal
-    F componentType();
+    DynamicHub componentType();
 
     @KeepOriginal
-    F arrayType();
+    DynamicHub arrayType();
 }
 
 /** FIXME: How to handle java.lang.Class.ReflectionData? */