[GR-13468] Use a TruffleFile to build sources that we think are from a file

PullRequest: graalpython/388

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -26,7 +26,6 @@
 package com.oracle.graal.python;
 
 import java.io.IOException;
-import java.net.URI;
 import java.net.URL;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -89,7 +88,6 @@
 import com.oracle.truffle.api.object.ObjectType;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.api.source.Source.LiteralBuilder;
 import com.oracle.truffle.api.source.Source.SourceBuilder;
 import com.oracle.truffle.api.source.SourceSection;
 
@@ -428,13 +426,31 @@ public static TruffleLogger getLogger() {
         return TruffleLogger.getLogger(ID);
     }
 
-    public static Source newSource(PythonContext ctxt, String src, String name, URI uri) {
+    public static Source newSource(PythonContext ctxt, String src, String name, boolean mayBeFile) {
         try {
-            LiteralBuilder sourceBuilder = Source.newBuilder(ID, src, name);
-            if (uri != null) {
-                sourceBuilder.uri(uri);
+            SourceBuilder sourceBuilder = null;
+            if (mayBeFile) {
+                try {
+                    TruffleFile truffleFile = ctxt.getEnv().getTruffleFile(name);
+                    if (truffleFile.exists()) {
+                        // XXX: (tfel): We don't know if the expression has anything to do with the
+                        // filename that's given. We would really have to compare the entire
+                        // contents, but as a first approximation, we compare the content lengths.
+                        // We override the contents of the source builder with the given source
+                        // regardless.
+                        if (src.length() == truffleFile.size()) {
+                            sourceBuilder = Source.newBuilder(ID, truffleFile);
+                            sourceBuilder.content(src);
+                        }
+                    }
+                } catch (SecurityException | IOException e) {
+                    sourceBuilder = null;
+                }
+            }
+            if (sourceBuilder == null) {
+                sourceBuilder = Source.newBuilder(ID, src, name);
             }
-            return newSource(ctxt, sourceBuilder, name);
+            return newSource(ctxt, sourceBuilder);
         } catch (IOException e) {
             throw new AssertionError();
         }
@@ -446,7 +462,7 @@ public Source newSource(PythonContext ctxt, TruffleFile src, String name) throws
         try {
             return cachedSources.computeIfAbsent(src, t -> {
                 try {
-                    return newSource(ctxt, Source.newBuilder(ID, src), name);
+                    return newSource(ctxt, Source.newBuilder(ID, src).name(name));
                 } catch (IOException e) {
                     throw new RuntimeException(e);
                 }
@@ -460,7 +476,7 @@ public Source newSource(PythonContext ctxt, URL url, String name) throws IOExcep
         try {
             return cachedSources.computeIfAbsent(url, t -> {
                 try {
-                    return newSource(ctxt, Source.newBuilder(ID, url), name);
+                    return newSource(ctxt, Source.newBuilder(ID, url).name(name));
                 } catch (IOException e) {
                     throw new RuntimeException(e);
                 }
@@ -470,14 +486,13 @@ public Source newSource(PythonContext ctxt, URL url, String name) throws IOExcep
         }
     }
 
-    private static Source newSource(PythonContext ctxt, SourceBuilder srcBuilder, String name) throws IOException {
-        SourceBuilder newBuilder = srcBuilder.name(name).mimeType(MIME_TYPE);
+    private static Source newSource(PythonContext ctxt, SourceBuilder srcBuilder) throws IOException {
         boolean coreIsInitialized = ctxt.getCore().isInitialized();
         boolean internal = !coreIsInitialized && !PythonOptions.getOption(ctxt, PythonOptions.ExposeInternalSources);
         if (internal) {
             srcBuilder.internal(true);
         }
-        return newBuilder.build();
+        return srcBuilder.build();
     }
 
     @Override

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -74,7 +74,6 @@
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.math.BigInteger;
-import java.net.URI;
 import java.nio.CharBuffer;
 import java.util.List;
 import java.util.function.Supplier;
@@ -167,7 +166,6 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
@@ -698,14 +696,14 @@ public abstract static class CompileNode extends PythonBuiltinNode {
          * Decides wether this node should attempt to map the filename to a URI for the benefit of
          * Truffle tooling
          */
-        private final boolean mapFilenameToUri;
+        private final boolean mayBeFromFile;
 
-        public CompileNode(boolean mapFilenameToUri) {
-            this.mapFilenameToUri = mapFilenameToUri;
+        public CompileNode(boolean mayBeFromFile) {
+            this.mayBeFromFile = mayBeFromFile;
         }
 
         public CompileNode() {
-            this.mapFilenameToUri = true;
+            this.mayBeFromFile = true;
         }
 
         public abstract PCode execute(Object source, String filename, String mode, Object kwFlags, Object kwDontInherit, Object kwOptimize);
@@ -728,8 +726,7 @@ PCode compile(OpaqueBytes source, String filename, String mode, Object kwFlags,
         @TruffleBoundary
         PCode compile(String expression, String filename, String mode, Object kwFlags, Object kwDontInherit, Object kwOptimize) {
             PythonContext context = getContext();
-            URI uri = mapToUri(expression, filename, context);
-            Source source = PythonLanguage.newSource(context, expression, filename, uri);
+            Source source = PythonLanguage.newSource(context, expression, filename, mayBeFromFile);
             ParserMode pm;
             if (mode.equals("exec")) {
                 pm = ParserMode.File;
@@ -748,27 +745,6 @@ PCode compile(String expression, String filename, String mode, Object kwFlags, O
             }
         }
 
-        private URI mapToUri(String expression, String filename, PythonContext context) {
-            if (mapFilenameToUri) {
-                URI uri = null;
-                try {
-                    TruffleFile truffleFile = context.getEnv().getTruffleFile(filename);
-                    if (truffleFile.exists()) {
-                        // XXX: (tfel): We don't know if the expression has anything to do with the
-                        // filename that's given. We would really have to compare the entire
-                        // contents, but as a first approximation, we compare the content lengths
-                        if (expression.length() == truffleFile.size()) {
-                            uri = truffleFile.toUri();
-                        }
-                    }
-                } catch (SecurityException | IOException e) {
-                }
-                return uri;
-            } else {
-                return null;
-            }
-        }
-
         @SuppressWarnings("unused")
         @Specialization
         PCode compile(PCode code, String filename, String mode, Object flags, Object dontInherit, Object optimize) {