Add jarPath retrieval

Author: jormundur00

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/AnalyzeMethodsRequiringMetadataUsagePhase.java

@@ -178,8 +178,10 @@ public class AnalyzeMethodsRequiringMetadataUsagePhase extends BasePhase<CorePro
     protected void run(StructuredGraph graph, CoreProviders context) {
         List<MethodCallTargetNode> callTargetNodes = graph.getNodes(MethodCallTargetNode.TYPE).snapshot();
         for (MethodCallTargetNode callTarget : callTargetNodes) {
+            AnalysisType callerClass = (AnalysisType) graph.method().getDeclaringClass();
+            String jarPath = getJarPath(callerClass);
             Pair<String, String> methodDetails = getMethod(graph, callTarget);
-            if (methodDetails != null) {
+            if (methodDetails != null && jarPath != null) {
                 String methodType = methodDetails.getLeft();
                 String methodName = methodDetails.getRight();
 
@@ -199,10 +201,6 @@ protected void run(StructuredGraph graph, CoreProviders context) {
     }
 
     public Pair<String, String> getMethod(StructuredGraph graph, MethodCallTargetNode callTarget) {
-        AnalysisType callerClass = (AnalysisType) graph.method().getDeclaringClass();
-        if (!containedInJars(callerClass)) {
-            return null;
-        }
         String methodName = callTarget.targetMethod().getName();
         String declaringClass = callTarget.targetMethod().getDeclaringClass().toJavaName();
 
@@ -218,19 +216,23 @@ public Pair<String, String> getMethod(StructuredGraph graph, MethodCallTargetNod
         return null;
     }
 
-    private boolean containedInJars(AnalysisType callerClass) {
+    private String getJarPath(AnalysisType callerClass) {
         try {
             CodeSource jarPathSource = callerClass.getJavaClass().getProtectionDomain().getCodeSource();
             if (jarPathSource == null) {
-                return false;
+                return null;
             }
 
             URL jarPathURL = jarPathSource.getLocation();
             if (jarPathURL == null) {
-                return false;
+                return null;
             }
 
-            return AnalyzeMethodsRequiringMetadataUsageFeature.instance().getJarPaths().contains(jarPathURL.toURI().getPath());
+            String jarPath = jarPathURL.toURI().getPath();
+            if (AnalyzeMethodsRequiringMetadataUsageFeature.instance().getJarPaths().contains(jarPath)) {
+                return jarPath;
+            }
+            return null;
         } catch (URISyntaxException e) {
             throw new RuntimeException(e);
         }