Replace cannotBeOverridden check for str/bytes/bytearray

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java

@@ -2264,11 +2264,10 @@ private static int lengthResult(int current, int ext) {
             }
         }
 
-        @Specialization(guards = {"hasStorage(seq)", "cannotBeOverridden(seq, inliningTarget, getClassNode)"}, limit = "1")
+        @Specialization(guards = {"hasStorage(seq)", "isBuiltinSequence(seq)"})
         @SuppressWarnings("truffle-static-method")
         SequenceStorage doWithStorage(SequenceStorage left, PSequence seq, int len,
                         @Bind("this") Node inliningTarget,
-                        @SuppressWarnings("unused") @Exclusive @Cached GetClassNode getClassNode,
                         @Cached GetSequenceStorageNode getStorageNode,
                         @Exclusive @Cached EnsureCapacityNode ensureCapacityNode,
                         @Cached ConcatBaseNode concatStoragesNode) {
@@ -2295,12 +2294,11 @@ SequenceStorage doWithStorage(SequenceStorage left, PSequence seq, int len,
             }
         }
 
-        @Specialization(guards = "!hasStorage(iterable) || !cannotBeOverridden(iterable, inliningTarget, getClassNode)", limit = "1")
+        @Fallback
         @SuppressWarnings("truffle-static-method")
         @InliningCutoff
         SequenceStorage doWithoutStorage(VirtualFrame frame, SequenceStorage left, Object iterable, int len,
                         @Bind("this") Node inliningTarget,
-                        @SuppressWarnings("unused") @Exclusive @Cached GetClassNode getClassNode,
                         @Cached PyObjectGetIter getIter,
                         @Exclusive @Cached EnsureCapacityNode ensureCapacityNode,
                         @Cached GetNextNode getNextNode,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorNodes.java

@@ -153,16 +153,14 @@ static int doSet(Node inliningTarget, PSet object,
             return lenNode.execute(inliningTarget, object.getDictStorage());
         }
 
-        @Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)")
-        static int doPString(Node inliningTarget, PString object,
-                        @Shared("getClass") @SuppressWarnings("unused") @Cached GetPythonObjectClassNode getClassNode,
+        @Specialization(guards = "isBuiltinPString(object)")
+        static int doPString(PString object,
                         @Cached(inline = false) StringNodes.StringLenNode lenNode) {
             return lenNode.execute(object);
         }
 
-        @Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)")
-        static int doPBytes(Node inliningTarget, PBytesLike object,
-                        @Shared("getClass") @SuppressWarnings("unused") @Cached GetPythonObjectClassNode getClassNode) {
+        @Specialization(guards = "isBuiltinBytesLike(object)")
+        static int doPBytes(PBytesLike object) {
             return object.getSequenceStorage().length();
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/PString.java

@@ -26,6 +26,7 @@
 package com.oracle.graal.python.builtins.objects.str;
 
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
+import static com.oracle.graal.python.util.PythonUtils.builtinClassToType;
 
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.str.StringNodes.StringMaterializeNode;
@@ -62,12 +63,12 @@ public final class PString extends PSequence {
     private PBytes wCharBytes;
 
     public PString(Object clazz, Shape instanceShape, NativeCharSequence value) {
-        super(clazz, instanceShape);
+        super(builtinClassToType(clazz), instanceShape);
         this.nativeCharSequence = value;
     }
 
     public PString(Object clazz, Shape instanceShape, TruffleString value) {
-        super(clazz, instanceShape);
+        super(builtinClassToType(clazz), instanceShape);
         assert value != null;
         this.materializedValue = value;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringNodes.java

@@ -41,7 +41,7 @@
 package com.oracle.graal.python.builtins.objects.str;
 
 import static com.oracle.graal.python.nodes.ErrorMessages.INVALID_SEQ_ITEM;
-import static com.oracle.graal.python.nodes.PGuards.cannotBeOverridden;
+import static com.oracle.graal.python.nodes.PGuards.isBuiltinPString;
 import static com.oracle.graal.python.nodes.StringLiterals.T_EMPTY_STRING;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.MemoryError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
@@ -488,9 +488,8 @@ static PString doString(Node inliningTarget, TruffleString string,
 
         @Specialization
         static PString doPString(Node inliningTarget, PString string,
-                        @Cached GetClassNode getClassNode,
                         @Shared @Cached HiddenAttr.WriteNode writeNode) {
-            if (cannotBeOverridden(getClassNode.execute(inliningTarget, string))) {
+            if (isBuiltinPString(string)) {
                 writeNode.execute(inliningTarget, string, HiddenAttr.INTERNED, true);
                 return string;
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyBytesCheckExactNode.java

@@ -40,12 +40,13 @@
  */
 package com.oracle.graal.python.lib;
 
-import com.oracle.graal.python.builtins.PythonBuiltinClassType;
-import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinObjectExactProfile;
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.graal.python.builtins.objects.bytes.PBytes;
+import com.oracle.graal.python.nodes.PGuards;
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 
@@ -55,16 +56,21 @@
 @GenerateUncached
 @GenerateInline
 @GenerateCached(false)
+@ImportStatic(PGuards.class)
 public abstract class PyBytesCheckExactNode extends Node {
+    public static boolean executeUncached(Object object) {
+        return PyBytesCheckExactNodeGen.getUncached().execute(null, object);
+    }
+
     public abstract boolean execute(Node inliningTarget, Object object);
 
-    @Specialization
-    static boolean doGeneric(Node inliningTarget, Object object,
-                    @Cached IsBuiltinObjectExactProfile isBuiltin) {
-        return isBuiltin.profileObject(inliningTarget, object, PythonBuiltinClassType.PBytes);
+    @Specialization(guards = "isBuiltinBytes(bytes)")
+    static boolean doBuiltinBytes(@SuppressWarnings("unused") PBytes bytes) {
+        return true;
     }
 
-    public static boolean executeUncached(Object object) {
-        return PyBytesCheckExactNodeGen.getUncached().execute(null, object);
+    @Fallback
+    static boolean doOther(@SuppressWarnings("unused") Object object) {
+        return false;
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyDictCheckExactNode.java

@@ -42,6 +42,7 @@
 
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.nodes.PGuards;
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -68,12 +69,7 @@ static boolean doBuiltinDict(@SuppressWarnings("unused") PDict dict) {
         return true;
     }
 
-    @Specialization(guards = "!isBuiltinDict(dict)")
-    static boolean doOtherDict(@SuppressWarnings("unused") PDict dict) {
-        return false;
-    }
-
-    @Specialization(guards = "!isDict(object)")
+    @Fallback
     static boolean doOther(@SuppressWarnings("unused") Object object) {
         return false;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyFrozenSetCheckExactNode.java

@@ -42,6 +42,7 @@
 
 import com.oracle.graal.python.builtins.objects.set.PFrozenSet;
 import com.oracle.graal.python.nodes.PGuards;
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -68,12 +69,7 @@ static boolean doBuiltinFrozenSet(@SuppressWarnings("unused") PFrozenSet frozenS
         return true;
     }
 
-    @Specialization(guards = "!isBuiltinFrozenSet(frozenSet)")
-    static boolean doOtherFrozenSet(@SuppressWarnings("unused") PFrozenSet frozenSet) {
-        return false;
-    }
-
-    @Specialization(guards = "!isPFrozenSet(object)")
+    @Fallback
     static boolean doOther(@SuppressWarnings("unused") Object object) {
         return false;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyListCheckExactNode.java

@@ -42,6 +42,7 @@
 
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.nodes.PGuards;
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -68,12 +69,7 @@ static boolean doBuiltinList(@SuppressWarnings("unused") PList list) {
         return true;
     }
 
-    @Specialization(guards = "!isBuiltinList(list)")
-    static boolean doOtherList(@SuppressWarnings("unused") PList list) {
-        return false;
-    }
-
-    @Specialization(guards = "!isList(object)")
+    @Fallback
     static boolean doOther(@SuppressWarnings("unused") Object object) {
         return false;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyLongAsLongAndOverflowNode.java

@@ -108,7 +108,7 @@ static long doObject(VirtualFrame frame, Node inliningTarget, Object object,
                     @Cached BuiltinPyLongAsLongAndOverflowNode recursive) throws OverflowException {
         Object result = indexNode.execute(frame, inliningTarget, object);
         // PyNumberIndexNode guarantees that the result is a builtin integer
-        assert PyLongCheckExactNode.canBeBuiltinInt(result);
+        assert PyLongCheckExactNode.executeUncached(result);
         return recursive.execute(frame, inliningTarget, result);
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyLongCheckExactNode.java

@@ -43,6 +43,7 @@
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeVoidPtr;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.nodes.PNodeWithContext;
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -56,7 +57,7 @@
 @GenerateInline
 @GenerateCached(false)
 public abstract class PyLongCheckExactNode extends PNodeWithContext {
-    public static final boolean executeUncached(Object object) {
+    public static boolean executeUncached(Object object) {
         return PyLongCheckExactNodeGen.getUncached().execute(null, object);
     }
 
@@ -77,24 +78,14 @@ static boolean doBuiltinPInt(@SuppressWarnings("unused") PInt object) {
         return true;
     }
 
-    @Specialization(guards = "!isBuiltinPInt(object)")
-    static boolean doOtherPInt(@SuppressWarnings("unused") PInt object) {
-        return false;
-    }
-
-    @Specialization(guards = "!canBeBuiltinInt(object)")
-    static boolean doOther(@SuppressWarnings("unused") Object object) {
-        return false;
-    }
-
     @Specialization
     static boolean doNativePtr(@SuppressWarnings("unused") PythonNativeVoidPtr object) {
         return true;
     }
 
-    protected static boolean canBeBuiltinInt(Object object) {
-        // Boolean is a subclass, don't put it here
-        return object instanceof Integer || object instanceof Long || object instanceof PInt || object instanceof PythonNativeVoidPtr;
+    @Fallback
+    static boolean doOther(@SuppressWarnings("unused") Object object) {
+        return false;
     }
 
     public static PyLongCheckExactNode getUncached() {