added ResolvedJavaType.getDeclaredTypes implementations (GR-69872)

Author: dougxc

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetResolvedJavaType.java

@@ -295,6 +295,11 @@ public boolean isMember() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public ResolvedJavaType[] getDeclaredTypes() {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public ResolvedJavaType getEnclosingType() {
         throw new UnsupportedOperationException();

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replaycomp/proxy/HotSpotResolvedJavaTypeProxy.java

@@ -355,6 +355,14 @@ public final boolean isMember() {
         return (boolean) handle(isMemberMethod, isMemberInvokable);
     }
 
+    private static final SymbolicMethod getDeclaredTypesMethod = method("getDeclaredTypes");
+    private static final InvokableMethod getDeclaredTypesInvokable = (receiver, args) -> ((HotSpotResolvedJavaType) receiver).getDeclaredMethods();
+
+    @Override
+    public ResolvedJavaType[] getDeclaredTypes() {
+        return (ResolvedJavaType[]) handle(getDeclaredTypesMethod, getDeclaredTypesInvokable);
+    }
+
     private static final SymbolicMethod getEnclosingTypeMethod = method("getEnclosingType");
     private static final InvokableMethod getEnclosingTypeInvokable = (receiver, args) -> ((HotSpotResolvedJavaType) receiver).getEnclosingType();
 

espresso/src/com.oracle.truffle.espresso.jvmci/src/com/oracle/truffle/espresso/jvmci/meta/EspressoResolvedArrayType.java

@@ -272,6 +272,11 @@ public boolean isMember() {
         return false;
     }
 
+    @Override
+    public ResolvedJavaType[] getDeclaredTypes() {
+        return new ResolvedJavaType[0];
+    }
+
     @Override
     public ResolvedJavaType getEnclosingType() {
         return null;

espresso/src/com.oracle.truffle.espresso.jvmci/src/com/oracle/truffle/espresso/jvmci/meta/EspressoResolvedInstanceType.java

@@ -44,6 +44,7 @@
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
+import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ModifiersProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -451,6 +452,18 @@ public boolean isMember() {
         return getMirror().isMemberClass();
     }
 
+    @Override
+    public ResolvedJavaType[] getDeclaredTypes() {
+        Class<?>[] declaredClasses = getMirror().getDeclaredClasses();
+        ResolvedJavaType[] declaredTypes = new ResolvedJavaType[declaredClasses.length];
+        MetaAccessProvider metaAccess = runtime().getHostJVMCIBackend().getMetaAccess();
+        for (int i = 0; i != declaredTypes.length; i++) {
+            declaredTypes[i] = metaAccess.lookupJavaType(declaredClasses[i]);
+        }
+        return declaredTypes;
+
+    }
+
     @Override
     public ResolvedJavaType getEnclosingType() {
         Class<?> enclosingClass = getMirror().getEnclosingClass();

espresso/src/com.oracle.truffle.espresso.jvmci/src/com/oracle/truffle/espresso/jvmci/meta/EspressoResolvedPrimitiveType.java

@@ -240,6 +240,11 @@ public boolean isMember() {
         return false;
     }
 
+    @Override
+    public ResolvedJavaType[] getDeclaredTypes() {
+        return new ResolvedJavaType[0];
+    }
+
     @Override
     public ResolvedJavaType getEnclosingType() {
         return null;

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java

@@ -1296,6 +1296,15 @@ public AnalysisType getEnclosingType() {
         return universe.lookup(wrapped.getEnclosingType());
     }
 
+    @Override
+    public ResolvedJavaType[] getDeclaredTypes() {
+        ResolvedJavaType[] declaredTypes = wrapped.getDeclaredTypes();
+        for (int i = 0; i < declaredTypes.length; i++) {
+            declaredTypes[i] = universe.lookup(declaredTypes[i]);
+        }
+        return declaredTypes;
+    }
+
     @Override
     public AnalysisMethod[] getDeclaredMethods() {
         return getDeclaredMethods(true);

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/BaseLayerType.java

@@ -286,6 +286,11 @@ public boolean isMember() {
         throw AnalysisError.shouldNotReachHere("This type is incomplete and should not be used.");
     }
 
+    @Override
+    public ResolvedJavaType[] getDeclaredTypes() {
+        throw AnalysisError.shouldNotReachHere("This type is incomplete and should not be used.");
+    }
+
     @Override
     public ResolvedJavaType getEnclosingType() {
         return enclosingType;

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateType.java

@@ -407,6 +407,11 @@ public boolean isMember() {
         throw VMError.intentionallyUnimplemented(); // ExcludeFromJacocoGeneratedReport
     }
 
+    @Override
+    public ResolvedJavaType[] getDeclaredTypes() {
+        throw VMError.intentionallyUnimplemented(); // ExcludeFromJacocoGeneratedReport
+    }
+
     @Override
     public ResolvedJavaType getEnclosingType() {
         Class<?> enclosingClass = DynamicHub.toClass(hub).getEnclosingClass();

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/CustomSubstitutionType.java

@@ -159,6 +159,11 @@ public ResolvedJavaType[] getInterfaces() {
         return original.getInterfaces();
     }
 
+    @Override
+    public ResolvedJavaType[] getDeclaredTypes() {
+        return original.getDeclaredTypes();
+    }
+
     @Override
     public ResolvedJavaType getSingleImplementor() {
         return original.getSingleImplementor();

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedType.java

@@ -515,6 +515,15 @@ public HostedType getEnclosingType() {
         return universe.lookup(wrapped.getEnclosingType());
     }
 
+    @Override
+    public ResolvedJavaType[] getDeclaredTypes() {
+        ResolvedJavaType[] declaredTypes = wrapped.getDeclaredTypes();
+        for (int i = 0; i < declaredTypes.length; i++) {
+            declaredTypes[i] = universe.lookup(declaredTypes[i]);
+        }
+        return declaredTypes;
+    }
+
     @Override
     public ResolvedJavaMethod[] getDeclaredConstructors() {
         return getDeclaredConstructors(true);