deal with places without source locations

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java

@@ -64,6 +64,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -446,13 +447,24 @@ public RootCallTarget getRootCallTarget() {
     }
 
     @ExportMessage
-    public SourceSection getSourceLocation() {
+    public SourceSection getSourceLocation() throws UnsupportedMessageException {
+        SourceSection result = readSourceLocation();
+        if (result != null) {
+            return result;
+        } else {
+            throw UnsupportedMessageException.create();
+        }
+    }
+
+    private SourceSection readSourceLocation() {
         RootNode rootNode = getRootNode();
+        SourceSection result;
         if (rootNode instanceof PRootNode) {
-            return ((PRootNode) rootNode).getSourceSection();
+            result = ((PRootNode) rootNode).getSourceSection();
         } else {
-            return getForeignSourceSection(rootNode);
+            result = getForeignSourceSection(rootNode);
         }
+        return result;
     }
 
     @TruffleBoundary
@@ -462,6 +474,6 @@ private static SourceSection getForeignSourceSection(RootNode rootNode) {
 
     @ExportMessage
     public boolean hasSourceLocation() {
-        return true;
+        return readSourceLocation() != null;
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PFunction.java

@@ -43,6 +43,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -206,13 +207,25 @@ public boolean isCallable() {
     }
 
     @ExportMessage
-    public SourceSection getSourceLocation() {
+    public SourceSection getSourceLocation() throws UnsupportedMessageException {
+        SourceSection result = getSourceLocationDirect();
+        if (result == null) {
+            throw UnsupportedMessageException.create();
+        } else {
+            return result;
+        }
+    }
+
+    @TruffleBoundary
+    private SourceSection getSourceLocationDirect() {
         RootNode rootNode = getCallTarget().getRootNode();
+        SourceSection result;
         if (rootNode instanceof PRootNode) {
-            return ((PRootNode) rootNode).getSourceSection();
+            result = ((PRootNode) rootNode).getSourceSection();
         } else {
-            return getForeignSourceSection(rootNode);
+            result = getForeignSourceSection(rootNode);
         }
+        return result;
     }
 
     @TruffleBoundary
@@ -222,6 +235,6 @@ private static SourceSection getForeignSourceSection(RootNode rootNode) {
 
     @ExportMessage
     public boolean hasSourceLocation() {
-        return true;
+        return getSourceLocationDirect() != null;
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/PList.java

@@ -31,6 +31,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStoreException;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.library.ExportMessage.Ignore;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
@@ -136,9 +137,16 @@ public static PList expect(Object value) throws UnexpectedResultException {
     }
 
     @ExportMessage
-    public SourceSection getSourceLocation() {
+    public SourceSection getSourceLocation() throws UnsupportedMessageException {
         ListLiteralNode node = getOrigin();
-        return node != null ? node.getSourceSection() : null;
+        SourceSection result = null;
+        if (node != null) {
+            result = node.getSourceSection();
+        }
+        if (result == null) {
+            throw UnsupportedMessageException.create();
+        }
+        return result;
     }
 
     @ExportMessage

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java

@@ -34,8 +34,11 @@
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.source.SourceSection;
 
 /**
  * Mutable class.
@@ -89,4 +92,48 @@ String getMetaQualifiedName(
             return result;
         }
     }
+
+    /*
+     * N.b.: (tfel): This method is used to cache the source section of the first defined attribute
+     * that has a source section. This isn't precisely the classes definition location, but it is
+     * close. We can safely cache this regardless of any later shape changes or redefinitions,
+     * because this is best-effort only anyway. If it is called early, it is very likely we're
+     * getting some location near the actual definition. If it is called late, and potentially after
+     * some monkey-patching, we'll get some other source location.
+     */
+    protected static SourceSection findSourceSection(PythonManagedClass self) {
+        DynamicObject storage = self.getStorage();
+        for (Object key : storage.getShape().getKeys()) {
+            if (key instanceof String) {
+                Object value = ReadAttributeFromDynamicObjectNode.getUncached().execute(storage, key);
+                InteropLibrary uncached = InteropLibrary.getFactory().getUncached();
+                if (uncached.hasSourceLocation(value)) {
+                    try {
+                        return uncached.getSourceLocation(value);
+                    } catch (UnsupportedMessageException e) {
+                        // should not happen due to hasSourceLocation check
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    protected SourceSection getSourceLocation(
+                    @Shared("src") @Cached(value = "findSourceSection(this)", allowUncached = true) SourceSection section) throws UnsupportedMessageException {
+        if (section != null) {
+            return section;
+        } else {
+            throw UnsupportedMessageException.create();
+        }
+    }
+
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    protected boolean hasSourceLocation(
+                    @Shared("src") @Cached(value = "findSourceSection(this)", allowUncached = true) SourceSection section) {
+        return section != null;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonManagedClass.java

@@ -40,20 +40,12 @@
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.ComputeMroNode;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetSubclassesNode;
 import com.oracle.graal.python.nodes.PGuards;
-import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
 import com.oracle.graal.python.runtime.sequence.storage.MroSequenceStorage;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Cached.Shared;
-import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.UnsupportedMessageException;
-import com.oracle.truffle.api.library.ExportMessage;
-import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.Shape;
-import com.oracle.truffle.api.source.SourceSection;
 
 public abstract class PythonManagedClass extends PythonObject implements PythonAbstractClass {
 
@@ -245,42 +237,4 @@ public final void setSulongType(Object dynamicSulongType) {
     public boolean needsNativeAllocation() {
         return needsNativeAllocation;
     }
-
-    /*
-     * N.b.: (tfel): This method is used to cache the source section of the first defined attribute
-     * that has a source section. This isn't precisely the classes definition location, but it is
-     * close. We can safely cache this regardless of any later shape changes or redefinitions,
-     * because this is best-effort only anyway. If it is called early, it is very likely we're
-     * getting some location near the actual definition. If it is called late, and potentially after
-     * some monkey-patching, we'll get some other source location.
-     */
-    protected static SourceSection findSourceSection(PythonManagedClass self) {
-        DynamicObject storage = self.getStorage();
-        for (Object key : storage.getShape().getKeys()) {
-            if (key instanceof String) {
-                Object value = ReadAttributeFromDynamicObjectNode.getUncached().execute(storage, key);
-                InteropLibrary uncached = InteropLibrary.getFactory().getUncached();
-                if (uncached.hasSourceLocation(value)) {
-                    try {
-                        return uncached.getSourceLocation(value);
-                    } catch (UnsupportedMessageException e) {
-                        // should not happen due to hasSourceLocation check
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @ExportMessage
-    protected SourceSection getSourceLocation(
-                    @Shared("src") @Cached(value = "findSourceSection(this)", allowUncached = true) SourceSection section) {
-        return section;
-    }
-
-    @ExportMessage
-    protected boolean hasSourceLocation(
-                    @Shared("src") @Cached(value = "findSourceSection(this)", allowUncached = true) SourceSection section) {
-        return section != null;
-    }
 }