Fix debug info for substituted methods

Author: zakkak

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java

@@ -34,15 +34,16 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
+import com.oracle.graal.pointsto.infrastructure.WrappedJavaMethod;
 import com.oracle.svm.core.SubstrateOptions;
+import com.oracle.svm.hosted.substitute.SubstitutionMethod;
 import org.graalvm.compiler.code.CompilationResult;
 import org.graalvm.compiler.code.SourceMapping;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
-import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider;
 import com.oracle.svm.core.graal.code.SubstrateBackend;
 import com.oracle.svm.hosted.image.sources.SourceManager;
@@ -310,22 +311,11 @@ public int line() {
 
         @SuppressWarnings("try")
         private void computeFullFilePath() {
-            ResolvedJavaType declaringClass = method.getDeclaringClass();
+            ResolvedJavaType declaringClass = getDeclaringClass();
             Class<?> clazz = null;
             if (declaringClass instanceof OriginalClassProvider) {
                 clazz = ((OriginalClassProvider) declaringClass).getJavaClass();
             }
-            /*
-             * HostedType wraps an AnalysisType and both HostedType and AnalysisType punt calls to
-             * getSourceFilename to the wrapped class so for consistency we need to do the path
-             * lookup relative to the doubly unwrapped HostedType or singly unwrapped AnalysisType.
-             */
-            if (declaringClass instanceof HostedType) {
-                declaringClass = ((HostedType) declaringClass).getWrapped();
-            }
-            if (declaringClass instanceof AnalysisType) {
-                declaringClass = ((AnalysisType) declaringClass).getWrapped();
-            }
             SourceManager sourceManager = ImageSingletons.lookup(SourceManager.class);
             try (DebugContext.Scope s = debugContext.scope("DebugCodeInfo", declaringClass)) {
                 fullFilePath = sourceManager.findAndCacheSource(declaringClass, clazz, debugContext);
@@ -334,6 +324,20 @@ private void computeFullFilePath() {
             }
         }
 
+        private ResolvedJavaType getDeclaringClass() {
+            ResolvedJavaMethod wrappedMethod = method;
+            while (wrappedMethod instanceof WrappedJavaMethod) {
+                wrappedMethod = ((WrappedJavaMethod) wrappedMethod).getWrapped();
+            }
+            ResolvedJavaType declaringClass;
+            if (wrappedMethod instanceof SubstitutionMethod) {
+                declaringClass = ((SubstitutionMethod) wrappedMethod).getAnnotated().getDeclaringClass();
+            } else {
+                declaringClass = wrappedMethod.getDeclaringClass();
+            }
+            return declaringClass;
+        }
+
     }
 
     /**