Minor: missing profiles, remove dead code, simplify assertion in addOperatorsToBuiltin

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/deque/DequeBuiltins.java

@@ -671,8 +671,8 @@ static void rotate(PDeque self, int n) {
     @GenerateUncached
     public abstract static class DequeLenNode extends LenBuiltinNode {
         @Specialization
-        static int doIt(Object self) {
-            return ((PDeque) self).getSize();
+        static int doGeneric(PDeque self) {
+            return self.getSize();
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/GetSetDescriptorTypeBuiltins.java

@@ -76,6 +76,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import com.oracle.truffle.api.strings.TruffleString;
 
 /**
@@ -165,11 +166,13 @@ abstract static class DescrSet extends DescrSetBuiltinNode {
         @Specialization(guards = "!isNoValue(value)")
         static void doDescriptorSet(VirtualFrame frame, Object descr, Object obj, Object value,
                         @Bind("this") Node inliningTarget,
+                        @Shared @Cached InlinedConditionProfile isGetSetDescrProfile,
                         @Shared @Cached DescriptorCheckNode descriptorCheckNode,
                         @Cached DescrSetNode setNode) {
             Object type;
             Object name;
-            if (descr instanceof GetSetDescriptor getSet) {
+            if (isGetSetDescrProfile.profile(inliningTarget, descr instanceof GetSetDescriptor)) {
+                GetSetDescriptor getSet = (GetSetDescriptor) descr;
                 type = getSet.getType();
                 name = getSet.getName();
             } else if (descr instanceof HiddenAttrDescriptor hidden) {
@@ -183,13 +186,15 @@ static void doDescriptorSet(VirtualFrame frame, Object descr, Object obj, Object
         }
 
         @Specialization(guards = "isNoValue(value)")
-        static void doDescriptorDel(VirtualFrame frame, Object descr, Object obj, Object value,
+        static void doDescriptorDel(VirtualFrame frame, Object descr, Object obj, @SuppressWarnings("unused") Object value,
                         @Bind("this") Node inliningTarget,
+                        @Shared @Cached InlinedConditionProfile isGetSetDescrProfile,
                         @Shared @Cached DescriptorCheckNode descriptorCheckNode,
                         @Cached DescrDeleteNode deleteNode) {
             Object type;
             Object name;
-            if (descr instanceof GetSetDescriptor getSet) {
+            if (isGetSetDescrProfile.profile(inliningTarget, descr instanceof GetSetDescriptor)) {
+                GetSetDescriptor getSet = (GetSetDescriptor) descr;
                 type = getSet.getType();
                 name = getSet.getName();
             } else if (descr instanceof HiddenAttrDescriptor hidden) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/superobject/SuperBuiltins.java

@@ -436,7 +436,6 @@ private Object genericGetAttr(VirtualFrame frame, Object object, Object attr) {
         @Specialization
         Object get(VirtualFrame frame, SuperObject self, Object attr,
                         @Bind("this") Node inliningTarget,
-                        @Cached GetClassNode getClassNode,
                         @Cached GetObjectSlotsNode getSlotsNode,
                         @Cached TruffleString.EqualNode equalNode,
                         @Cached GetObjectTypeNode getObjectType,

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

@@ -801,18 +801,20 @@ public static void setSlots(PythonAbstractClass klass, TpSlots slots) {
         }
     }
 
-    public static void addOperatorsToBuiltin(Map<TruffleString, BoundBuiltinCallable<?>> builtins, Python3Core core, PythonBuiltinClassType type) {
-        TpSlots slots = type.getDeclaredSlots();
-
+    private static boolean checkNoMagicOverrides(PythonBuiltinClassType type) {
         // Check that no one is trying to define magic methods directly
         // If the assertion fires: you should define @Slot instead of @Builtin
         // We do not look in MRO, we may have already called addOperatorsToBuiltin on super
         var readAttr = ReadAttributeFromObjectNode.getUncachedForceType();
-        assert readAttr.execute(type, T___BOOL__) == PNone.NO_VALUE;
-        assert readAttr.execute(type, T___LEN__) == PNone.NO_VALUE;
-        assert readAttr.execute(type, T___GET__) == PNone.NO_VALUE;
-        assert readAttr.execute(type, T___SET__) == PNone.NO_VALUE;
-        assert readAttr.execute(type, T___DELETE__) == PNone.NO_VALUE;
+        for (TruffleString name : SPECIAL2SLOT.keySet()) {
+            assert readAttr.execute(type, name) == PNone.NO_VALUE : name;
+        }
+        return true;
+    }
+
+    public static void addOperatorsToBuiltin(Map<TruffleString, BoundBuiltinCallable<?>> builtins, Python3Core core, PythonBuiltinClassType type) {
+        TpSlots slots = type.getDeclaredSlots();
+        assert checkNoMagicOverrides(type);
 
         // Similar to CPython:add_operators
         for (var slotDefGroup : SLOTDEFS.entrySet()) {

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

@@ -143,7 +143,6 @@ static int doOthers(Frame frame, Node inliningTarget, Object object,
         if (slots.sq_length() != null) {
             return callSlotLenNode.execute((VirtualFrame) frame, inliningTarget, slots.sq_length(), object);
         }
-        hasNoSqLenBranch.enter(inliningTarget);
         throw raiseError(object, inliningTarget, raiseNode, slots);
     }