rework after review

Author: adinn

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

@@ -94,6 +94,7 @@ private class NativeImageDebugCodeInfo implements DebugCodeInfo {
         private Path fullFilePath;
         private final Path cachePath;
 
+        @SuppressWarnings("try")
         NativeImageDebugCodeInfo(HostedMethod method, CompilationResult compilation) {
             this.method = method;
             HostedType declaringClass = method.getDeclaringClass();
@@ -102,7 +103,7 @@ private class NativeImageDebugCodeInfo implements DebugCodeInfo {
             this.compilation = compilation;
             SourceManager sourceManager = ImageSingletons.lookup(SourceManager.class);
             try (DebugContext.Scope s = debugContext.scope("DebugCodeInfo", declaringClass)) {
-                fullFilePath = ImageSingletons.lookup(SourceManager.class).findAndCacheSource(javaType, clazz, debugContext);
+                fullFilePath = sourceManager.findAndCacheSource(javaType, clazz, debugContext);
                 this.cachePath = sourceManager.getCachePathForSource(javaType);
             } catch (Throwable e) {
                 throw debugContext.handle(e);
@@ -300,6 +301,7 @@ public int line() {
             return -1;
         }
 
+        @SuppressWarnings("try")
         private void computeFullFilePathAndCachePath() {
             ResolvedJavaType declaringClass = method.getDeclaringClass();
             Class<?> clazz = null;
@@ -316,9 +318,10 @@ private void computeFullFilePathAndCachePath() {
             if (declaringClass instanceof AnalysisType) {
                 declaringClass = ((AnalysisType) declaringClass).getWrapped();
             }
+            SourceManager sourceManager = ImageSingletons.lookup(SourceManager.class);
             try (DebugContext.Scope s = debugContext.scope("DebugCodeInfo", declaringClass)) {
-                fullFilePath = ImageSingletons.lookup(SourceManager.class).findAndCacheSource(declaringClass, clazz, debugContext);
-                cachePath = ImageSingletons.lookup(SourceManager.class).getCachePathForSource(declaringClass);
+                fullFilePath = sourceManager.findAndCacheSource(declaringClass, clazz, debugContext);
+                cachePath = sourceManager.getCachePathForSource(declaringClass);
             } catch (Throwable e) {
                 throw debugContext.handle(e);
             }