[GR-13376] Try to set the filename as URI

PullRequest: graalpython/368

Author: timfel

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2015, Regents of the University of California
  *
  * All rights reserved.
@@ -26,6 +26,7 @@
 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;
@@ -88,6 +89,7 @@
 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;
 
@@ -422,9 +424,13 @@ public static TruffleLogger getLogger() {
         return TruffleLogger.getLogger(ID);
     }
 
-    public static Source newSource(PythonContext ctxt, String src, String name) {
+    public static Source newSource(PythonContext ctxt, String src, String name, URI uri) {
         try {
-            return newSource(ctxt, Source.newBuilder(ID, src, name), name);
+            LiteralBuilder sourceBuilder = Source.newBuilder(ID, src, name);
+            if (uri != null) {
+                sourceBuilder.uri(uri);
+            }
+            return newSource(ctxt, sourceBuilder, name);
         } catch (IOException e) {
             throw new AssertionError();
         }

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

@@ -74,6 +74,7 @@
 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;
@@ -156,6 +157,7 @@
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.nodes.util.CastToIntegerFromIndexNode;
 import com.oracle.graal.python.nodes.util.CastToStringNode;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.PythonParser.ParserMode;
@@ -167,6 +169,7 @@
 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;
@@ -546,7 +549,7 @@ private static BigInteger[] divideAndRemainder(PInt a, PInt b) {
     @GenerateNodeFactory
     public abstract static class EvalNode extends PythonBuiltinNode {
         protected final String funcname = "eval";
-        @Child protected CompileNode compileNode = CompileNode.create();
+        @Child protected CompileNode compileNode = CompileNode.create(false);
         @Child private IndirectCallNode indirectCallNode = IndirectCallNode.create();
         @Child private HasInheritedAttributeNode hasGetItemNode;
 
@@ -700,6 +703,19 @@ public final Object execute(VirtualFrame frame) {
     @GenerateNodeFactory
     @TypeSystemReference(PythonArithmeticTypes.class)
     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;
+
+        public CompileNode(boolean mapFilenameToUri) {
+            this.mapFilenameToUri = mapFilenameToUri;
+        }
+
+        public CompileNode() {
+            this.mapFilenameToUri = true;
+        }
 
         public abstract PCode execute(Object source, String filename, String mode, Object kwFlags, Object kwDontInherit, Object kwOptimize);
 
@@ -720,7 +736,9 @@ PCode compile(OpaqueBytes source, String filename, String mode, Object kwFlags,
         @Specialization
         @TruffleBoundary
         PCode compile(String expression, String filename, String mode, Object kwFlags, Object kwDontInherit, Object kwOptimize) {
-            Source source = PythonLanguage.newSource(getContext(), expression, filename);
+            PythonContext context = getContext();
+            URI uri = mapToUri(expression, filename, context);
+            Source source = PythonLanguage.newSource(context, expression, filename, uri);
             ParserMode pm;
             if (mode.equals("exec")) {
                 pm = ParserMode.File;
@@ -739,14 +757,35 @@ 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) {
             return code;
         }
 
-        public static CompileNode create() {
-            return BuiltinFunctionsFactory.CompileNodeFactory.create(new ReadArgumentNode[]{});
+        public static CompileNode create(boolean mapFilenameToUri) {
+            return BuiltinFunctionsFactory.CompileNodeFactory.create(mapFilenameToUri, new ReadArgumentNode[]{});
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/ZipImporterBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -280,7 +280,7 @@ public PCode doit(PZipImporter self, String fullname,
             }
             if (compileNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                compileNode = insert(CompileNode.create());
+                compileNode = insert(CompileNode.create(false));
             }
             ModuleCodeData md = self.getModuleCode(fullname);
             if (canNotFind.profile(md == null)) {