[GR-21590] Update imports

PullRequest: graalpython/3289

Author: qunaibit

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "e48c2d0867e9f758f6208d75c29e1ca013af7c4f" }
+{ "overlay": "758ce7b10944b137cfe11244fda3ba9f35c4b4c0" }

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

@@ -1015,7 +1015,6 @@ static Object reversed(VirtualFrame frame, Object cls, Object sequence,
                         @Cached("create(Reversed)") LookupSpecialMethodSlotNode lookupReversed,
                         @Cached CallUnaryMethodNode callReversed,
                         @Cached PySequenceSizeNode pySequenceSizeNode,
-                        @Cached("create(GetItem)") LookupSpecialMethodSlotNode getItemNode,
                         @Cached InlinedConditionProfile noReversedProfile,
                         @Cached PySequenceCheckNode pySequenceCheck,
                         @Shared @Cached PythonObjectFactory factory,

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,10 +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.HashingStorageLen;
-import com.oracle.graal.python.builtins.objects.dict.PDict;
+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.PSet;
+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;
@@ -62,6 +62,7 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.HostCompilerDirectives.InliningCutoff;
 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;
@@ -72,7 +73,6 @@
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.strings.TruffleString;
 
 /**
@@ -106,16 +106,16 @@ static int doTuple(PTuple object) {
         return object.getSequenceStorage().length();
     }
 
-    @Specialization(guards = "cannotBeOverriddenForImmutableType(object)")
-    static int doDict(Node inliningTarget, PDict object,
-                    @Shared("hashingStorageLen") @Cached HashingStorageLen lenNode) {
-        return lenNode.execute(inliningTarget, object.getDictStorage());
+    @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, PSet object,
+    static int doSet(Node inliningTarget, PBaseSet object,
                     @Shared("getClass") @SuppressWarnings("unused") @Cached GetPythonObjectClassNode getClassNode,
-                    @Shared("hashingStorageLen") @Cached HashingStorageLen lenNode) {
+                    @Cached HashingStorageNodes.HashingStorageLen lenNode) {
         return lenNode.execute(inliningTarget, object.getDictStorage());
     }
 
@@ -137,8 +137,7 @@ static int doPBytes(Node inliningTarget, PBytesLike object,
     static int doOthers(Frame frame, Node inliningTarget, Object object,
                     @Cached GetObjectSlotsNode getTpSlotsNode,
                     @Cached TpSlotLen.CallSlotLenNode callSlotLenNode,
-                    @Cached InlinedBranchProfile hasNoSqLenBranch,
-                    @Cached PRaiseNode.Lazy raiseNode) {
+                    @Exclusive @Cached PRaiseNode.Lazy raiseNode) {
         TpSlots slots = getTpSlotsNode.execute(inliningTarget, object);
         if (slots.sq_length() != null) {
             return callSlotLenNode.execute((VirtualFrame) frame, inliningTarget, slots.sq_length(), object);

mx.graalpython/suite.py

@@ -45,31 +45,31 @@
             },
             {
                 "name": "sdk",
-                "version": "d1196beb6bc6e7d68c971d471d372506e4109c4e",
+                "version": "b9126869e93338dde41dd3aa102131aa347bb803",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "tools",
-                "version": "d1196beb6bc6e7d68c971d471d372506e4109c4e",
+                "version": "b9126869e93338dde41dd3aa102131aa347bb803",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "d1196beb6bc6e7d68c971d471d372506e4109c4e",
+                "version": "b9126869e93338dde41dd3aa102131aa347bb803",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "d1196beb6bc6e7d68c971d471d372506e4109c4e",
+                "version": "b9126869e93338dde41dd3aa102131aa347bb803",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},