Fix raising location

Author: steve-s

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

@@ -125,7 +125,6 @@
 import com.oracle.graal.python.runtime.sequence.storage.EmptySequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage.Env;
@@ -196,6 +195,18 @@ public void postInitialize(Python3Core core) {
         AbstractImportNode.importModule(T_INTERNAL_POLYGLOT_MODULE);
     }
 
+    abstract static class InteropBuiltinBaseNode extends PythonBuiltinNode {
+        @Child InteropLibrary interop;
+
+        public InteropLibrary getInterop() {
+            if (interop == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                interop = insert(InteropLibrary.getFactory().createDispatched(1));
+            }
+            return interop;
+        }
+    }
+
     @Builtin(name = "import_value", minNumOfPositionalArgs = 1, parameterNames = {"name"})
     @GenerateNodeFactory
     public abstract static class ImportNode extends PythonBuiltinNode {
@@ -386,16 +397,6 @@ private static void export(Node raisingNode, String name, Object obj) {
         }
     }
 
-    @CompilationFinal static InteropLibrary UNCACHED_INTEROP;
-
-    static InteropLibrary getInterop() {
-        if (UNCACHED_INTEROP == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            UNCACHED_INTEROP = InteropLibrary.getFactory().getUncached();
-        }
-        return UNCACHED_INTEROP;
-    }
-
     abstract static class FitsInNumberNode extends PythonUnaryBuiltinNode {
         static boolean isSupportedNumber(Object number) {
             return number instanceof Number || number instanceof PInt;
@@ -933,7 +934,7 @@ public static void clearInteropTypeRegistryCache(PythonContext pythonContext) {
 
     @Builtin(name = "__read__", minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
-    public abstract static class ReadNode extends PythonBuiltinNode {
+    public abstract static class ReadNode extends InteropBuiltinBaseNode {
         @Specialization
         @TruffleBoundary
         Object read(Object receiver, Object key) {
@@ -955,7 +956,7 @@ Object read(Object receiver, Object key) {
 
     @Builtin(name = "__write__", minNumOfPositionalArgs = 3)
     @GenerateNodeFactory
-    public abstract static class WriteNode extends PythonBuiltinNode {
+    public abstract static class WriteNode extends InteropBuiltinBaseNode {
         @Specialization
         @TruffleBoundary
         Object write(Object receiver, Object key, Object value) {
@@ -978,7 +979,7 @@ Object write(Object receiver, Object key, Object value) {
 
     @Builtin(name = "__remove__", minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
-    public abstract static class removeNode extends PythonBuiltinNode {
+    public abstract static class removeNode extends InteropBuiltinBaseNode {
         @Specialization
         @TruffleBoundary
         Object remove(Object receiver, Object key) {
@@ -1001,9 +1002,9 @@ Object remove(Object receiver, Object key) {
 
     @Builtin(name = "__execute__", minNumOfPositionalArgs = 1, takesVarArgs = true)
     @GenerateNodeFactory
-    public abstract static class executeNode extends PythonBuiltinNode {
+    public abstract static class executeNode extends InteropBuiltinBaseNode {
         @Specialization
-        static Object exec(Object receiver, Object[] arguments,
+        Object exec(Object receiver, Object[] arguments,
                         @Bind Node inliningTarget,
                         @Cached PRaiseNode raiseNode) {
             try {
@@ -1016,9 +1017,9 @@ static Object exec(Object receiver, Object[] arguments,
 
     @Builtin(name = "__new__", minNumOfPositionalArgs = 1, takesVarArgs = true)
     @GenerateNodeFactory
-    public abstract static class newNode extends PythonBuiltinNode {
+    public abstract static class newNode extends InteropBuiltinBaseNode {
         @Specialization
-        static Object instantiate(Object receiver, Object[] arguments,
+        Object instantiate(Object receiver, Object[] arguments,
                         @Bind Node inliningTarget,
                         @Cached PRaiseNode raiseNode) {
             try {
@@ -1031,9 +1032,9 @@ static Object instantiate(Object receiver, Object[] arguments,
 
     @Builtin(name = "__invoke__", minNumOfPositionalArgs = 2, takesVarArgs = true)
     @GenerateNodeFactory
-    public abstract static class invokeNode extends PythonBuiltinNode {
+    public abstract static class invokeNode extends InteropBuiltinBaseNode {
         @Specialization
-        static Object invoke(Object receiver, TruffleString key, Object[] arguments,
+        Object invoke(Object receiver, TruffleString key, Object[] arguments,
                         @Bind Node inliningTarget,
                         @Cached TruffleString.ToJavaStringNode toJavaStringNode,
                         @Cached PRaiseNode raiseNode) {
@@ -1047,27 +1048,27 @@ static Object invoke(Object receiver, TruffleString key, Object[] arguments,
 
     @Builtin(name = "__is_null__", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
-    public abstract static class IsNullNode extends PythonBuiltinNode {
+    public abstract static class IsNullNode extends InteropBuiltinBaseNode {
         @Specialization
-        static boolean isNull(Object receiver) {
+        boolean isNull(Object receiver) {
             return getInterop().isNull(receiver);
         }
     }
 
     @Builtin(name = "__has_size__", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
-    public abstract static class HasSizeNode extends PythonBuiltinNode {
+    public abstract static class HasSizeNode extends InteropBuiltinBaseNode {
         @Specialization
-        static boolean hasSize(Object receiver) {
+        boolean hasSize(Object receiver) {
             return getInterop().hasArrayElements(receiver);
         }
     }
 
     @Builtin(name = "__get_size__", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
-    public abstract static class GetSizeNode extends PythonBuiltinNode {
+    public abstract static class GetSizeNode extends InteropBuiltinBaseNode {
         @Specialization
-        static Object getSize(Object receiver,
+        Object getSize(Object receiver,
                         @Bind Node inliningTarget,
                         @Cached PRaiseNode raiseNode) {
             try {
@@ -1080,27 +1081,27 @@ static Object getSize(Object receiver,
 
     @Builtin(name = "__is_boxed__", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
-    public abstract static class IsBoxedNode extends PythonBuiltinNode {
+    public abstract static class IsBoxedNode extends InteropBuiltinBaseNode {
         @Specialization
-        static boolean isBoxed(Object receiver) {
+        boolean isBoxed(Object receiver) {
             return getInterop().isString(receiver) || getInterop().fitsInDouble(receiver) || getInterop().fitsInLong(receiver);
         }
     }
 
     @Builtin(name = "__has_keys__", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
-    public abstract static class HasKeysNode extends PythonBuiltinNode {
+    public abstract static class HasKeysNode extends InteropBuiltinBaseNode {
         @Specialization
-        static boolean hasKeys(Object receiver) {
+        boolean hasKeys(Object receiver) {
             return getInterop().hasMembers(receiver);
         }
     }
 
     @Builtin(name = "__key_info__", minNumOfPositionalArgs = 3)
     @GenerateNodeFactory
-    public abstract static class KeyInfoNode extends PythonBuiltinNode {
+    public abstract static class KeyInfoNode extends InteropBuiltinBaseNode {
         @Specialization
-        static boolean keyInfo(Object receiver, TruffleString tmember, TruffleString info,
+        boolean keyInfo(Object receiver, TruffleString tmember, TruffleString info,
                         @Cached TruffleString.ToJavaStringNode toJavaStringNode,
                         @Cached TruffleString.EqualNode equalNode) {
             String member = toJavaStringNode.execute(tmember);
@@ -1132,9 +1133,9 @@ static boolean keyInfo(Object receiver, TruffleString tmember, TruffleString inf
 
     @Builtin(name = "__keys__", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
-    public abstract static class KeysNode extends PythonBuiltinNode {
+    public abstract static class KeysNode extends InteropBuiltinBaseNode {
         @Specialization
-        static Object remove(Object receiver,
+        Object remove(Object receiver,
                         @Bind Node inliningTarget,
                         @Cached PRaiseNode raiseNode) {
             try {
@@ -1148,9 +1149,9 @@ static Object remove(Object receiver,
     @Builtin(name = "__element_info__", minNumOfPositionalArgs = 3)
     @GenerateNodeFactory
     @TypeSystemReference(PythonIntegerTypes.class)
-    public abstract static class ArrayElementInfoNode extends PythonBuiltinNode {
+    public abstract static class ArrayElementInfoNode extends InteropBuiltinBaseNode {
         @Specialization
-        static boolean keyInfo(Object receiver, long member, TruffleString info,
+        boolean keyInfo(Object receiver, long member, TruffleString info,
                         @Cached TruffleString.EqualNode equalNode) {
             if (equalNode.execute(info, T_EXISTS, TS_ENCODING)) {
                 return getInterop().isArrayElementExisting(receiver, member);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/MemoryViewNodes.java

@@ -75,6 +75,7 @@
 import com.oracle.truffle.api.CompilerDirectives.ValueType;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateCached;
@@ -88,6 +89,7 @@
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
+import com.oracle.truffle.api.profiles.InlinedIntValueProfile;
 import com.oracle.truffle.api.strings.TruffleString;
 
 public class MemoryViewNodes {
@@ -195,35 +197,21 @@ static void notImplemented(Node inliningTarget, BufferFormat format, TruffleStri
     abstract static class ReadBytesAtNode extends Node {
         public abstract void execute(Node inliningTarget, byte[] dest, int destOffset, int len, PMemoryView self, Object ptr, int offset);
 
-        @Specialization(guards = {"ptr != null", "cachedLen == len", "cachedLen <= 8"}, limit = "4")
-        @ExplodeLoop
-        static void doNativeCached(byte[] dest, int destOffset, @SuppressWarnings("unused") int len, @SuppressWarnings("unused") PMemoryView self, Object ptr, int offset,
-                        @Cached("len") int cachedLen,
-                        @Shared @Cached(inline = false) CStructAccess.ReadByteNode readNode) {
-            readNode.readByteArray(ptr, dest, cachedLen, offset, destOffset);
-        }
-
-        @Specialization(guards = "ptr != null", replaces = "doNativeCached")
-        static void doNativeGeneric(byte[] dest, int destOffset, int len, @SuppressWarnings("unused") PMemoryView self, Object ptr, int offset,
-                        @Shared @Cached(inline = false) CStructAccess.ReadByteNode readNode) {
-            readNode.readByteArray(ptr, dest, len, offset, destOffset);
+        @Specialization(guards = "ptr != null")
+        static void doNativeCached(Node inliningTarget, byte[] dest, int destOffset, @SuppressWarnings("unused") int len, @SuppressWarnings("unused") PMemoryView self, Object ptr, int offset,
+                        @Exclusive @Cached InlinedIntValueProfile lengthProfile,
+                        @Cached(inline = false) CStructAccess.ReadByteNode readNode) {
+            readNode.readByteArray(ptr, dest, lengthProfile.profile(inliningTarget, len), offset, destOffset);
         }
 
-        @Specialization(guards = {"ptr == null", "cachedLen == len", "cachedLen <= 8"}, limit = "4")
-        @ExplodeLoop
-        void doManagedCached(byte[] dest, int destOffset, @SuppressWarnings("unused") int len, PMemoryView self, @SuppressWarnings("unused") Object ptr, int offset,
+        @Specialization(guards = "ptr == null", limit = "3")
+        static void doManagedCached(Node inliningTarget, byte[] dest, int destOffset, @SuppressWarnings("unused") int len, PMemoryView self, @SuppressWarnings("unused") Object ptr, int offset,
                         @CachedLibrary("self.getBuffer()") PythonBufferAccessLibrary bufferLib,
-                        @Cached("len") int cachedLen) {
-            checkBufferBounds(this, self, bufferLib, offset, cachedLen);
+                        @Exclusive @Cached InlinedIntValueProfile lenProfile) {
+            int cachedLen = lenProfile.profile(inliningTarget, len);
+            checkBufferBounds(inliningTarget, self, bufferLib, offset, cachedLen);
             bufferLib.readIntoByteArray(self.getBuffer(), offset, dest, destOffset, cachedLen);
         }
-
-        @Specialization(guards = "ptr == null", replaces = "doManagedCached", limit = "3")
-        void doManagedGeneric(byte[] dest, int destOffset, int len, PMemoryView self, @SuppressWarnings("unused") Object ptr, int offset,
-                        @CachedLibrary("self.getBuffer()") PythonBufferAccessLibrary bufferLib) {
-            checkBufferBounds(this, self, bufferLib, offset, len);
-            bufferLib.readIntoByteArray(self.getBuffer(), offset, dest, destOffset, len);
-        }
     }
 
     @GenerateUncached
@@ -232,35 +220,21 @@ void doManagedGeneric(byte[] dest, int destOffset, int len, PMemoryView self, @S
     abstract static class WriteBytesAtNode extends Node {
         public abstract void execute(Node inliningTarget, byte[] src, int srcOffset, int len, PMemoryView self, Object ptr, int offset);
 
-        @Specialization(guards = {"ptr != null", "cachedLen == len", "cachedLen <= 8"}, limit = "4")
-        @ExplodeLoop
-        static void doNativeCached(byte[] src, int srcOffset, @SuppressWarnings("unused") int len, @SuppressWarnings("unused") PMemoryView self, Object ptr, int offset,
-                        @Cached("len") int cachedLen,
-                        @Shared @Cached(inline = false) CStructAccess.WriteByteNode writeNode) {
-            writeNode.writeByteArray(ptr, src, cachedLen, srcOffset, offset);
-        }
-
-        @Specialization(guards = "ptr != null", replaces = "doNativeCached")
-        static void doNativeGeneric(byte[] src, int srcOffset, int len, @SuppressWarnings("unused") PMemoryView self, Object ptr, int offset,
-                        @Shared @Cached(inline = false) CStructAccess.WriteByteNode writeNode) {
-            writeNode.writeByteArray(ptr, src, len, srcOffset, offset);
+        @Specialization(guards = "ptr != null")
+        static void doNativeCached(Node inliningTarget, byte[] src, int srcOffset, int len, @SuppressWarnings("unused") PMemoryView self, Object ptr, int offset,
+                        @Exclusive @Cached InlinedIntValueProfile lenProfile,
+                        @Cached(inline = false) CStructAccess.WriteByteNode writeNode) {
+            writeNode.writeByteArray(ptr, src, lenProfile.profile(inliningTarget, len), srcOffset, offset);
         }
 
-        @Specialization(guards = {"ptr == null", "cachedLen == len", "cachedLen <= 8"}, limit = "4")
-        @ExplodeLoop
-        void doManagedCached(byte[] src, int srcOffset, @SuppressWarnings("unused") int len, PMemoryView self, @SuppressWarnings("unused") Object ptr, int offset,
+        @Specialization(guards = "ptr == null", limit = "3")
+        static void doManagedCached(Node inliningTarget, byte[] src, int srcOffset, int len, PMemoryView self, @SuppressWarnings("unused") Object ptr, int offset,
                         @CachedLibrary("self.getBuffer()") PythonBufferAccessLibrary bufferLib,
-                        @Cached("len") int cachedLen) {
-            checkBufferBounds(this, self, bufferLib, offset, cachedLen);
+                        @Exclusive @Cached InlinedIntValueProfile lenProfile) {
+            int cachedLen = lenProfile.profile(inliningTarget, len);
+            checkBufferBounds(inliningTarget, self, bufferLib, offset, cachedLen);
             bufferLib.writeFromByteArray(self.getBuffer(), offset, src, srcOffset, cachedLen);
         }
-
-        @Specialization(guards = "ptr == null", replaces = "doManagedCached", limit = "3")
-        void doManagedGeneric(byte[] src, int srcOffset, int len, PMemoryView self, @SuppressWarnings("unused") Object ptr, int offset,
-                        @CachedLibrary("self.getBuffer()") PythonBufferAccessLibrary bufferLib) {
-            checkBufferBounds(this, self, bufferLib, offset, len);
-            bufferLib.writeFromByteArray(self.getBuffer(), offset, src, srcOffset, len);
-        }
     }
 
     @GenerateInline(false)       // footprint reduction 48 -> 29