PySequenceSizeNode can do PBaseSet

Author: qunaibit

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -279,7 +279,7 @@ public boolean hasArrayElements(
                     // GR-44020: make shared:
                     @Exclusive @Cached PRaiseNode.Lazy raiseNode,
                     @Cached GetObjectSlotsNode getSlotsNode,
-                    @Cached PySequenceCheckNode sequenceCheck,
+                    @Exclusive @Cached PySequenceCheckNode sequenceCheck,
                     @Exclusive @Cached GilNode gil) {
         boolean mustRelease = gil.acquire();
         try {
@@ -386,6 +386,7 @@ public long getArraySize(
                     @Shared("getBehavior") @Cached GetInteropBehaviorNode getBehavior,
                     @Shared("getValue") @Cached GetInteropBehaviorValueNode getValue,
                     @Exclusive @Cached PySequenceSizeNode sequenceSizeNode,
+                    @Exclusive @Cached PySequenceCheckNode sequenceCheck,
                     // GR-44020: make shared:
                     @Exclusive @Cached CastToJavaLongExactNode toLongNode,
                     // GR-44020: make shared:
@@ -398,6 +399,9 @@ public long getArraySize(
             if (behavior != null) {
                 return getValue.executeLong(inliningTarget, behavior, method, toLongNode, raiseNode, this);
             } else {
+                if (!sequenceCheck.execute(inliningTarget, this)) {
+                    throw UnsupportedMessageException.create();
+                }
                 try {
                     return sequenceSizeNode.execute(null, inliningTarget, this);
                 } catch (PException pe) {

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

@@ -44,8 +44,10 @@
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 
 import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
+import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
 import com.oracle.graal.python.builtins.objects.list.PList;
+import com.oracle.graal.python.builtins.objects.set.PBaseSet;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.str.StringNodes;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
@@ -104,12 +106,17 @@ static int doTuple(PTuple object) {
         return object.getSequenceStorage().length();
     }
 
-    @Specialization
+    @Specialization(guards = "!isAnySet(object)")
     static int doPHashingCollection(Node inliningTarget, PHashingCollection object,
                     @Exclusive @Cached PRaiseNode.Lazy raise) {
         throw raise.get(inliningTarget).raise(TypeError, ErrorMessages.IS_NOT_A_SEQUENCE, object);
     }
-
+    @Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)")
+    static int doSet(Node inliningTarget, PBaseSet object,
+                     @Shared("getClass") @SuppressWarnings("unused") @Cached GetPythonObjectClassNode getClassNode,
+                     @Cached HashingStorageNodes.HashingStorageLen lenNode) {
+        return lenNode.execute(inliningTarget, object.getDictStorage());
+    }
     @Specialization(guards = "cannotBeOverridden(object, inliningTarget, getClassNode)")
     @InliningCutoff
     static int doPString(Node inliningTarget, PString object,