expose TruffleJavaDebugMethod over compilation identifier to match

truffle graphs in absence of method filter and scopes

Author: davleopo

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilationIdentifier.java

@@ -25,6 +25,7 @@
 package jdk.graal.compiler.core.common;
 
 import jdk.vm.ci.code.CompilationRequest;
+import jdk.vm.ci.meta.JavaMethod;
 
 /**
  * A unique identifier for a compilation. Compiled code can be mapped to a single compilation id.
@@ -77,4 +78,9 @@ public CompilationRequest getRequest() {
      * {@link Verbosity}.
      */
     String toString(Verbosity verbosity);
+
+    default JavaMethod asJavaMethod() {
+        return null;
+    }
+
 }

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

@@ -27,8 +27,8 @@
 import jdk.graal.compiler.core.common.CompilationIdentifier;
 import jdk.graal.compiler.core.common.CompilationRequestIdentifier;
 import jdk.graal.compiler.debug.GraalError;
-
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
+import jdk.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.runtime.JVMCICompiler;
 
 /**
@@ -98,4 +98,8 @@ public HotSpotCompilationRequest getRequest() {
         return request;
     }
 
+    @Override
+    public JavaMethod asJavaMethod() {
+        return getRequest().getMethod();
+    }
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleCompilationIdentifier.java

@@ -29,7 +29,9 @@
 
 import jdk.graal.compiler.hotspot.HotSpotCompilationIdentifier;
 import jdk.graal.compiler.truffle.TruffleCompilationIdentifier;
+import jdk.graal.compiler.truffle.TruffleDebugJavaMethod;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
+import jdk.vm.ci.meta.JavaMethod;
 
 /**
  * A {@link HotSpotCompilationIdentifier} for Truffle compilations.
@@ -74,4 +76,9 @@ protected StringBuilder buildID(StringBuilder sb) {
     public long getTruffleCompilationId() {
         return getRequest().getId();
     }
+
+    @Override
+    public JavaMethod asJavaMethod() {
+        return new TruffleDebugJavaMethod(getTask(), getCompilable());
+    }
 }

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleCompilationIdentifier.java

@@ -30,6 +30,8 @@
 
 import jdk.graal.compiler.debug.GraalError;
 import jdk.graal.compiler.truffle.TruffleCompilationIdentifier;
+import jdk.graal.compiler.truffle.TruffleDebugJavaMethod;
+import jdk.vm.ci.meta.JavaMethod;
 
 public final class SubstrateTruffleCompilationIdentifier extends SubstrateCompilationIdentifier implements TruffleCompilationIdentifier {
 
@@ -81,4 +83,9 @@ public TruffleCompilable getCompilable() {
     public long getTruffleCompilationId() {
         return id;
     }
+
+    @Override
+    public JavaMethod asJavaMethod() {
+        return new TruffleDebugJavaMethod(getTask(), getCompilable());
+    }
 }

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationIdentifier.java

@@ -37,6 +37,8 @@
 import com.oracle.truffle.compiler.TruffleCompilationTask;
 
 import jdk.graal.compiler.truffle.TruffleCompilationIdentifier;
+import jdk.graal.compiler.truffle.TruffleDebugJavaMethod;
+import jdk.vm.ci.meta.JavaMethod;
 
 final class IsolatedTruffleCompilationIdentifier extends IsolatedObjectProxy<TruffleCompilationIdentifier> implements TruffleCompilationIdentifier {
 
@@ -95,4 +97,9 @@ private static long getTruffleCompilationId0(@SuppressWarnings("unused") ClientI
         TruffleCompilationIdentifier id = IsolatedCompileClient.get().unhand(idHandle);
         return id.getTruffleCompilationId();
     }
+
+    @Override
+    public JavaMethod asJavaMethod() {
+        return new TruffleDebugJavaMethod(getTask(), getCompilable());
+    }
 }