Fix all/any with native storage

Author: msimacek

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

@@ -365,18 +365,17 @@ abstract static class AllOrAnySequenceStorageNode extends PNodeWithContext {
         abstract boolean execute(VirtualFrame frame, Node inliningTarget, SequenceStorage storageObj, AnyOrAllNodeType nodeType);
 
         @Specialization
-        static boolean doBoolSequence(VirtualFrame frame, Node inliningTarget, BoolSequenceStorage sequenceStorage, AnyOrAllNodeType nodeType,
-                        @Shared @Cached InlinedLoopConditionProfile loopConditionProfile,
-                        @Shared @Cached InlinedCountingConditionProfile earlyExitProfile,
-                        @Shared @Cached PyObjectIsTrueNode isTrueNode) {
+        static boolean doBoolSequence(Node inliningTarget, BoolSequenceStorage sequenceStorage, AnyOrAllNodeType nodeType,
+                        @Exclusive @Cached InlinedLoopConditionProfile loopConditionProfile,
+                        @Exclusive @Cached InlinedCountingConditionProfile earlyExitProfile) {
             boolean[] internalArray = sequenceStorage.getInternalBoolArray();
             int seqLength = sequenceStorage.length();
 
             for (int i = 0; loopConditionProfile.profile(inliningTarget, i < seqLength); i++) {
-                if (nodeType == AnyOrAllNodeType.ALL && earlyExitProfile.profile(inliningTarget, !isTrueNode.execute(frame, inliningTarget, internalArray[i]))) {
+                if (nodeType == AnyOrAllNodeType.ALL && earlyExitProfile.profile(inliningTarget, !internalArray[i])) {
                     LoopNode.reportLoopCount(inliningTarget, i);
                     return false;
-                } else if (nodeType == AnyOrAllNodeType.ANY && earlyExitProfile.profile(inliningTarget, isTrueNode.execute(frame, inliningTarget, internalArray[i]))) {
+                } else if (nodeType == AnyOrAllNodeType.ANY && earlyExitProfile.profile(inliningTarget, internalArray[i])) {
                     LoopNode.reportLoopCount(inliningTarget, i);
                     return true;
                 }
@@ -386,18 +385,17 @@ static boolean doBoolSequence(VirtualFrame frame, Node inliningTarget, BoolSeque
         }
 
         @Specialization
-        static boolean doIntSequence(VirtualFrame frame, Node inliningTarget, IntSequenceStorage sequenceStorage, AnyOrAllNodeType nodeType,
-                        @Shared @Cached InlinedLoopConditionProfile loopConditionProfile,
-                        @Shared @Cached InlinedCountingConditionProfile earlyExitProfile,
-                        @Shared @Cached PyObjectIsTrueNode isTrueNode) {
+        static boolean doIntSequence(Node inliningTarget, IntSequenceStorage sequenceStorage, AnyOrAllNodeType nodeType,
+                        @Exclusive @Cached InlinedLoopConditionProfile loopConditionProfile,
+                        @Exclusive @Cached InlinedCountingConditionProfile earlyExitProfile) {
             int[] internalArray = sequenceStorage.getInternalIntArray();
             int seqLength = sequenceStorage.length();
 
             for (int i = 0; loopConditionProfile.profile(inliningTarget, i < seqLength); i++) {
-                if (nodeType == AnyOrAllNodeType.ALL && earlyExitProfile.profile(inliningTarget, !isTrueNode.execute(frame, inliningTarget, internalArray[i]))) {
+                if (nodeType == AnyOrAllNodeType.ALL && earlyExitProfile.profile(inliningTarget, internalArray[i] == 0)) {
                     LoopNode.reportLoopCount(inliningTarget, i);
                     return false;
-                } else if (nodeType == AnyOrAllNodeType.ANY && earlyExitProfile.profile(inliningTarget, isTrueNode.execute(frame, inliningTarget, internalArray[i]))) {
+                } else if (nodeType == AnyOrAllNodeType.ANY && earlyExitProfile.profile(inliningTarget, internalArray[i] != 0)) {
                     LoopNode.reportLoopCount(inliningTarget, i);
                     return true;
                 }
@@ -408,17 +406,19 @@ static boolean doIntSequence(VirtualFrame frame, Node inliningTarget, IntSequenc
 
         @Specialization
         static boolean doGenericSequence(VirtualFrame frame, Node inliningTarget, SequenceStorage sequenceStorage, AnyOrAllNodeType nodeType,
-                        @Shared @Cached InlinedLoopConditionProfile loopConditionProfile,
-                        @Shared @Cached InlinedCountingConditionProfile earlyExitProfile,
-                        @Shared @Cached PyObjectIsTrueNode isTrueNode) {
-            Object[] internalArray = sequenceStorage.getInternalArray();
+                        @Exclusive @Cached InlinedLoopConditionProfile loopConditionProfile,
+                        @Exclusive @Cached InlinedCountingConditionProfile earlyExitProfile,
+                        @Cached PyObjectIsTrueNode isTrueNode,
+                        @Cached SequenceStorageNodes.GetItemScalarNode getItem) {
             int seqLength = sequenceStorage.length();
 
             for (int i = 0; loopConditionProfile.profile(inliningTarget, i < seqLength); i++) {
-                if (nodeType == AnyOrAllNodeType.ALL && earlyExitProfile.profile(inliningTarget, !isTrueNode.execute(frame, inliningTarget, internalArray[i]))) {
+                if (nodeType == AnyOrAllNodeType.ALL &&
+                                earlyExitProfile.profile(inliningTarget, !isTrueNode.execute(frame, inliningTarget, getItem.execute(inliningTarget, sequenceStorage, i)))) {
                     LoopNode.reportLoopCount(inliningTarget, i);
                     return false;
-                } else if (nodeType == AnyOrAllNodeType.ANY && earlyExitProfile.profile(inliningTarget, isTrueNode.execute(frame, inliningTarget, internalArray[i]))) {
+                } else if (nodeType == AnyOrAllNodeType.ANY &&
+                                earlyExitProfile.profile(inliningTarget, isTrueNode.execute(frame, inliningTarget, getItem.execute(inliningTarget, sequenceStorage, i)))) {
                     LoopNode.reportLoopCount(inliningTarget, i);
                     return true;
                 }