The source loader now uses a URL instead of a TruffleFile to represent at debug source file.

Fixed a potential NPE bug when checking for wasm mime type.

Author: flohuemer

tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/types/Script.java

@@ -64,7 +64,7 @@ public Source getSourceLoaded() {
     }
 
     public boolean hasWasmSource() {
-        return source.hasBytes() && source.getMimeType().equals("application/wasm");
+        return source.hasBytes() && "application/wasm".equals(source.getMimeType());
     }
 
     public CharSequence getCharacters() {

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/debugging/data/DebugFunction.java

@@ -50,8 +50,8 @@
 import org.graalvm.wasm.debugging.parser.DebugSourceLoader;
 import org.graalvm.wasm.nodes.WasmDataAccess;
 
-import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.MaterializedFrame;
+import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 
 /**
@@ -140,7 +140,7 @@ public String language() {
 
     /**
      * @return Whether the source section of this function has already been computed.
-     * @see #computeSourceSection(DebugSourceLoader, TruffleLanguage.Env)
+     * @see #computeSourceSection(DebugSourceLoader)
      */
     public boolean hasSourceSection() {
         return sourceSection != null;
@@ -159,9 +159,12 @@ public SourceSection getSourceSection() {
     /**
      * Computes the source section for the function.
      */
-    public SourceSection computeSourceSection(DebugSourceLoader sourceLoader, TruffleLanguage.Env environment) {
+    public SourceSection computeSourceSection(DebugSourceLoader sourceLoader) {
         if (sourceSection == null) {
-            sourceSection = sourceLoader.load(filePath, language, environment).createSection(startLine);
+            final Source source = sourceLoader.load(filePath, language);
+            if (source != null) {
+                sourceSection = source.createSection(startLine);
+            }
         }
         return sourceSection;
     }

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/debugging/parser/DebugSourceLoader.java

@@ -41,13 +41,12 @@
 
 package org.graalvm.wasm.debugging.parser;
 
+import java.net.MalformedURLException;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.TruffleFile;
-import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.source.Source;
 
 /**
@@ -61,10 +60,9 @@ public class DebugSourceLoader {
      * 
      * @param path the path of the source
      * @param language the source language
-     * @param env Truffle environment used to access source files
      */
     @TruffleBoundary
-    public Source load(Path path, String language, TruffleLanguage.Env env) {
+    public Source load(Path path, String language) {
         if (path == null || language == null) {
             return null;
         }
@@ -75,8 +73,13 @@ public Source load(Path path, String language, TruffleLanguage.Env env) {
         if (cache.containsKey(path)) {
             return cache.get(path);
         }
-        final TruffleFile file = env.getInternalTruffleFile(path.toString());
-        final Source source = Source.newBuilder(language, file).content(Source.CONTENT_NONE).build();
+        final Source source;
+        try {
+            source = Source.newBuilder(language, path.toUri().toURL()).content(Source.CONTENT_NONE).build();
+        } catch (MalformedURLException | SecurityException e) {
+            // source not available or not accessible
+            return null;
+        }
         cache.put(path, source);
         return source;
     }

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/nodes/WasmFunctionRootNode.java

@@ -318,7 +318,7 @@ public final SourceSection getSourceSection() {
                 } else {
                     final WasmContext context = WasmContext.get(this);
                     if (context != null) {
-                        sourceSection = debugFunction.computeSourceSection(context.debugSourceLoader(), context.environment());
+                        sourceSection = debugFunction.computeSourceSection(context.debugSourceLoader());
                     }
                 }
             } else {
@@ -331,4 +331,9 @@ public final SourceSection getSourceSection() {
     public final Node[] getCallNodes() {
         return functionNode.getCallNodes();
     }
+
+    @Override
+    public boolean isInternal() {
+        return false;
+    }
 }

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/nodes/WasmInstrumentableFunctionNode.java

@@ -70,7 +70,6 @@
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 
 /**
@@ -163,7 +162,7 @@ public SourceSection getSourceSection() {
             } else {
                 final WasmContext context = WasmContext.get(this);
                 if (context != null) {
-                    return debugFunction.computeSourceSection(context.debugSourceLoader(), context.environment());
+                    return debugFunction.computeSourceSection(context.debugSourceLoader());
                 }
             }
         }
@@ -185,8 +184,8 @@ public InstrumentableNode materializeInstrumentableNodes(Set<Class<? extends Tag
                         if (debugFunction == null) {
                             return this;
                         }
-                        final Source source = debugFunction.computeSourceSection(context.debugSourceLoader(), context.environment()).getSource();
-                        if (source == null) {
+                        final SourceSection sourceSection = debugFunction.computeSourceSection(context.debugSourceLoader());
+                        if (sourceSection == null) {
                             return this;
                         }
                         final int functionStartOffset = module.functionSourceCodeStartOffset(functionIndex);
@@ -195,7 +194,7 @@ public InstrumentableNode materializeInstrumentableNodes(Set<Class<? extends Tag
                         }
                         final int functionEndOffset = module.functionSourceCodeEndOffset(functionIndex);
                         final DebugLineSection debugLineSection = debugFunction.lineMap().getLineIndexMap(functionStartOffset, functionEndOffset);
-                        final WasmInstrumentationSupportNode support = new WasmInstrumentationSupportNode(debugLineSection, source);
+                        final WasmInstrumentationSupportNode support = new WasmInstrumentationSupportNode(debugLineSection, sourceSection.getSource());
                         final BinaryParser binaryParser = new BinaryParser(module, context, module.codeSection());
                         final byte[] bytecode = binaryParser.createFunctionDebugBytecode(functionIndex, debugLineSection.offsetToLineIndexMap());
                         final WasmFunctionNode functionNodeDuplicate = new WasmFunctionNode(functionNode, bytecode, support::notifyLine);
@@ -233,7 +232,7 @@ public final Object getScope(Frame frame, @SuppressWarnings("unused") boolean no
         } else {
             final WasmContext wasmContext = WasmContext.get(this);
             if (wasmContext != null) {
-                sourceSection = debugFunction.computeSourceSection(wasmContext.debugSourceLoader(), wasmContext.environment());
+                sourceSection = debugFunction.computeSourceSection(wasmContext.debugSourceLoader());
             }
         }
 

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/nodes/WasmRootNode.java

@@ -142,4 +142,9 @@ public final String toString() {
     protected boolean isInstrumentable() {
         return false;
     }
+
+    @Override
+    public boolean isInternal() {
+        return true;
+    }
 }