[JVMCI] Add ResolvedJavaType#getEnclosingMethod [GR-70132]

Author: zapster

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

@@ -317,6 +317,11 @@ public ResolvedJavaType getEnclosingType() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public ResolvedJavaMethod getEnclosingMethod() {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public ResolvedJavaMethod[] getDeclaredConstructors() {
         return getDeclaredConstructors(true);

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

@@ -42,6 +42,7 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
+import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
 import jdk.vm.ci.hotspot.HotSpotResolvedJavaType;
 import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
 import jdk.vm.ci.meta.Assumptions;
@@ -86,6 +87,14 @@ public final HotSpotResolvedObjectType getArrayClass() {
         return (HotSpotResolvedObjectType) handle(getArrayClassMethod, getArrayClassInvokable);
     }
 
+    private static final SymbolicMethod getEnclosingMethodMethod = method("getEnclosingMethod");
+    private static final InvokableMethod getEnclosingMethodInvokable = (receiver, args) -> ((HotSpotResolvedJavaType) receiver).getEnclosingMethod();
+
+    @Override
+    public HotSpotResolvedJavaMethod getEnclosingMethod() {
+        return (HotSpotResolvedJavaMethod) handle(getEnclosingMethodMethod, getEnclosingMethodInvokable);
+    }
+
     private static final SymbolicMethod isHiddenMethod = method("isHidden");
     private static final InvokableMethod isHiddenInvokable = (receiver, args) -> ((HotSpotResolvedObjectType) receiver).isHidden();
 

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

@@ -294,6 +294,11 @@ public ResolvedJavaType getEnclosingType() {
         return null;
     }
 
+    @Override
+    public ResolvedJavaMethod getEnclosingMethod() {
+        return null;
+    }
+
     @Override
     public ResolvedJavaMethod[] getDeclaredConstructors(boolean forceLink) {
         return NO_METHODS;

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

@@ -34,6 +34,8 @@
 import static java.util.Objects.requireNonNull;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
 import java.util.Collections;
@@ -495,6 +497,16 @@ public ResolvedJavaType getEnclosingType() {
         return runtime().getHostJVMCIBackend().getMetaAccess().lookupJavaType(enclosingClass);
     }
 
+    @Override
+    public ResolvedJavaMethod getEnclosingMethod() {
+        Method enclosingMethod = getMirror().getEnclosingMethod();
+        Executable enclosingExecutable = enclosingMethod != null ? enclosingMethod : getMirror().getEnclosingConstructor();
+        if (enclosingExecutable != null) {
+            return runtime().getHostJVMCIBackend().getMetaAccess().lookupJavaMethod(enclosingExecutable);
+        }
+        return null;
+    }
+
     @Override
     public native void link();
 

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

@@ -264,6 +264,11 @@ public ResolvedJavaType getEnclosingType() {
         return null;
     }
 
+    @Override
+    public ResolvedJavaMethod getEnclosingMethod() {
+        return null;
+    }
+
     @Override
     public ResolvedJavaMethod[] getDeclaredMethods(boolean forceLink) {
         return NO_METHODS;

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

@@ -1338,6 +1338,11 @@ public AnalysisType getEnclosingType() {
         return universe.lookup(wrapped.getEnclosingType());
     }
 
+    @Override
+    public AnalysisMethod getEnclosingMethod() {
+        return universe.lookup(wrapped.getEnclosingMethod());
+    }
+
     @Override
     public ResolvedJavaType[] getDeclaredTypes() {
         ResolvedJavaType[] declaredTypes = wrapped.getDeclaredTypes();

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

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

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/crema/CremaResolvedJavaType.java

@@ -81,16 +81,6 @@ public interface CremaResolvedJavaType extends ResolvedJavaType {
      */
     byte[] getRawTypeAnnotations();
 
-    /**
-     * If this object represents a local or anonymous class within a method, returns a
-     * {@link CremaEnclosingMethodInfo} object representing the immediately enclosing method of the
-     * underlying class. Returns {@code null} otherwise.
-     *
-     * @return the immediately enclosing method of the underlying class, if that class is a local or
-     *         anonymous class; otherwise {@code null}.
-     */
-    CremaEnclosingMethodInfo getEnclosingMethod();
-
     /**
      * Returns an array of {@code JavaType} objects reflecting all the classes and interfaces
      * declared as members of the class represented by this object. This includes public, protected,
@@ -128,7 +118,4 @@ public interface CremaResolvedJavaType extends ResolvedJavaType {
      * @return a JavaType representing the nest host
      */
     ResolvedJavaType getNestHost();
-
-    record CremaEnclosingMethodInfo(JavaType enclosingType, String name, String description) {
-    }
 }

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

@@ -25,6 +25,8 @@
 package com.oracle.svm.graal.meta;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -458,6 +460,17 @@ public ResolvedJavaType getEnclosingType() {
         return SubstrateMetaAccess.singleton().lookupJavaType(enclosingClass);
     }
 
+    @Override
+    public ResolvedJavaMethod getEnclosingMethod() {
+        Class<?> cls = DynamicHub.toClass(hub);
+        Method enclosingMethod = cls.getEnclosingMethod();
+        Executable enclosingExecutable = enclosingMethod != null ? enclosingMethod : cls.getEnclosingConstructor();
+        if (enclosingExecutable != null) {
+            return SubstrateMetaAccess.singleton().lookupJavaMethod(enclosingExecutable);
+        }
+        return null;
+    }
+
     @Override
     public ResolvedJavaMethod[] getDeclaredConstructors() {
         return getDeclaredConstructors(true);

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

@@ -266,6 +266,11 @@ public ResolvedJavaType getEnclosingType() {
         return original.getEnclosingType();
     }
 
+    @Override
+    public ResolvedJavaMethod getEnclosingMethod() {
+        return original.getEnclosingMethod();
+    }
+
     @Override
     public ResolvedJavaMethod[] getDeclaredConstructors() {
         return getDeclaredConstructors(true);