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

flohuemer · flohuemer · commit a223a847dfcb · 2025-04-15T14:52:01.000+02:00
Fixed a potential NPE bug when checking for wasm mime type.
diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/types/Script.java b/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() {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/debugging/data/DebugFunction.java b/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;
     }
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/debugging/parser/DebugSourceLoader.java b/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;
     }
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/nodes/WasmFunctionRootNode.java b/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;
+    }
 }
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/nodes/WasmInstrumentableFunctionNode.java b/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());
             }
         }
 
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/nodes/WasmRootNode.java b/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;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public Source getSourceLoaded() {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public boolean hasWasmSource() {`
`67`		`- return source.hasBytes() && source.getMimeType().equals("application/wasm");`
	`67`	`+ return source.hasBytes() && "application/wasm".equals(source.getMimeType());`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public CharSequence getCharacters() {`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ public final SourceSection getSourceSection() {`
`318`	`318`	`} else {`
`319`	`319`	`final WasmContext context = WasmContext.get(this);`
`320`	`320`	`if (context != null) {`
`321`		`- sourceSection = debugFunction.computeSourceSection(context.debugSourceLoader(), context.environment());`
	`321`	`+ sourceSection = debugFunction.computeSourceSection(context.debugSourceLoader());`
`322`	`322`	`}`
`323`	`323`	`}`
`324`	`324`	`} else {`
`@@ -331,4 +331,9 @@ public final SourceSection getSourceSection() {`
`331`	`331`	`public final Node[] getCallNodes() {`
`332`	`332`	`return functionNode.getCallNodes();`
`333`	`333`	`}`
	`334`	`+`
	`335`	`+ @Override`
	`336`	`+ public boolean isInternal() {`
	`337`	`+ return false;`
	`338`	`+ }`
`334`	`339`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@`
`70`	`70`	`import com.oracle.truffle.api.library.ExportLibrary;`
`71`	`71`	`import com.oracle.truffle.api.library.ExportMessage;`
`72`	`72`	`import com.oracle.truffle.api.nodes.Node;`
`73`		`-import com.oracle.truffle.api.source.Source;`
`74`	`73`	`import com.oracle.truffle.api.source.SourceSection;`
`75`	`74`
`76`	`75`	`/**`
`@@ -163,7 +162,7 @@ public SourceSection getSourceSection() {`
`163`	`162`	`} else {`
`164`	`163`	`final WasmContext context = WasmContext.get(this);`
`165`	`164`	`if (context != null) {`
`166`		`- return debugFunction.computeSourceSection(context.debugSourceLoader(), context.environment());`
	`165`	`+ return debugFunction.computeSourceSection(context.debugSourceLoader());`
`167`	`166`	`}`
`168`	`167`	`}`
`169`	`168`	`}`
`@@ -185,8 +184,8 @@ public InstrumentableNode materializeInstrumentableNodes(Set<Class<? extends Tag`
`185`	`184`	`if (debugFunction == null) {`
`186`	`185`	`return this;`
`187`	`186`	`}`
`188`		`- final Source source = debugFunction.computeSourceSection(context.debugSourceLoader(), context.environment()).getSource();`
`189`		`- if (source == null) {`
	`187`	`+ final SourceSection sourceSection = debugFunction.computeSourceSection(context.debugSourceLoader());`
	`188`	`+ if (sourceSection == null) {`
`190`	`189`	`return this;`
`191`	`190`	`}`
`192`	`191`	`final int functionStartOffset = module.functionSourceCodeStartOffset(functionIndex);`
`@@ -195,7 +194,7 @@ public InstrumentableNode materializeInstrumentableNodes(Set<Class<? extends Tag`
`195`	`194`	`}`
`196`	`195`	`final int functionEndOffset = module.functionSourceCodeEndOffset(functionIndex);`
`197`	`196`	`final DebugLineSection debugLineSection = debugFunction.lineMap().getLineIndexMap(functionStartOffset, functionEndOffset);`
`198`		`- final WasmInstrumentationSupportNode support = new WasmInstrumentationSupportNode(debugLineSection, source);`
	`197`	`+ final WasmInstrumentationSupportNode support = new WasmInstrumentationSupportNode(debugLineSection, sourceSection.getSource());`
`199`	`198`	`final BinaryParser binaryParser = new BinaryParser(module, context, module.codeSection());`
`200`	`199`	`final byte[] bytecode = binaryParser.createFunctionDebugBytecode(functionIndex, debugLineSection.offsetToLineIndexMap());`
`201`	`200`	`final WasmFunctionNode functionNodeDuplicate = new WasmFunctionNode(functionNode, bytecode, support::notifyLine);`
`@@ -233,7 +232,7 @@ public final Object getScope(Frame frame, @SuppressWarnings("unused") boolean no`
`233`	`232`	`} else {`
`234`	`233`	`final WasmContext wasmContext = WasmContext.get(this);`
`235`	`234`	`if (wasmContext != null) {`
`236`		`- sourceSection = debugFunction.computeSourceSection(wasmContext.debugSourceLoader(), wasmContext.environment());`
	`235`	`+ sourceSection = debugFunction.computeSourceSection(wasmContext.debugSourceLoader());`
`237`	`236`	`}`
`238`	`237`	`}`
`239`	`238`
Original file line number	Diff line number	Diff line change
`@@ -142,4 +142,9 @@ public final String toString() {`
`142`	`142`	`protected boolean isInstrumentable() {`
`143`	`143`	`return false;`
`144`	`144`	`}`
	`145`	`+`
	`146`	`+ @Override`
	`147`	`+ public boolean isInternal() {`
	`148`	`+ return true;`
	`149`	`+ }`
`145`	`150`	`}`