[GR-23331] Pass recursion test in test_richcmp

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_richcmp.txt

@@ -5,6 +5,7 @@
 *graalpython.lib-python.3.test.test_richcmp.MiscTest.test_exception_message
 *graalpython.lib-python.3.test.test_richcmp.MiscTest.test_misbehavin
 *graalpython.lib-python.3.test.test_richcmp.MiscTest.test_not
+*graalpython.lib-python.3.test.test_richcmp.MiscTest.test_recursion
 *graalpython.lib-python.3.test.test_richcmp.NumberTest.test_basic
 *graalpython.lib-python.3.test.test_richcmp.NumberTest.test_values
 *graalpython.lib-python.3.test.test_richcmp.VectorTest.test_mixed

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

@@ -161,6 +161,7 @@
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.graal.python.util.Supplier;
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -1980,6 +1981,17 @@ private LenNode getLenNode() {
             return lenNode;
         }
 
+        private static final boolean shortCutFalse(int llen, int rlen, BinCmpOp op) {
+            // shortcut: if the lengths differ, the lists differ.
+            CompilerAsserts.compilationConstant(op);
+            if (op == Eq.INSTANCE) {
+                if (llen != rlen) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         @SuppressWarnings("unused")
         @Specialization(guards = {"isEmpty(left)", "isEmpty(right)"})
         boolean doEmpty(SequenceStorage left, SequenceStorage right) {
@@ -1990,6 +2002,9 @@ boolean doEmpty(SequenceStorage left, SequenceStorage right) {
         boolean doBoolStorage(BoolSequenceStorage left, BoolSequenceStorage right) {
             int llen = left.length();
             int rlen = right.length();
+            if (shortCutFalse(llen, rlen, cmpOp)) {
+                return false;
+            }
             for (int i = 0; i < Math.min(llen, rlen); i++) {
                 int litem = PInt.intValue(left.getBoolItemNormalized(i));
                 int ritem = PInt.intValue(right.getBoolItemNormalized(i));
@@ -2004,6 +2019,9 @@ boolean doBoolStorage(BoolSequenceStorage left, BoolSequenceStorage right) {
         boolean doByteStorage(ByteSequenceStorage left, ByteSequenceStorage right) {
             int llen = left.length();
             int rlen = right.length();
+            if (shortCutFalse(llen, rlen, cmpOp)) {
+                return false;
+            }
             for (int i = 0; i < Math.min(llen, rlen); i++) {
                 byte litem = left.getByteItemNormalized(i);
                 byte ritem = right.getByteItemNormalized(i);
@@ -2018,6 +2036,9 @@ boolean doByteStorage(ByteSequenceStorage left, ByteSequenceStorage right) {
         boolean doIntStorage(IntSequenceStorage left, IntSequenceStorage right) {
             int llen = left.length();
             int rlen = right.length();
+            if (shortCutFalse(llen, rlen, cmpOp)) {
+                return false;
+            }
             for (int i = 0; i < Math.min(llen, rlen); i++) {
                 int litem = left.getIntItemNormalized(i);
                 int ritem = right.getIntItemNormalized(i);
@@ -2032,6 +2053,9 @@ boolean doIntStorage(IntSequenceStorage left, IntSequenceStorage right) {
         boolean doLongStorage(LongSequenceStorage left, LongSequenceStorage right) {
             int llen = left.length();
             int rlen = right.length();
+            if (shortCutFalse(llen, rlen, cmpOp)) {
+                return false;
+            }
             for (int i = 0; i < Math.min(llen, rlen); i++) {
                 long litem = left.getLongItemNormalized(i);
                 long ritem = right.getLongItemNormalized(i);
@@ -2046,6 +2070,9 @@ boolean doLongStorage(LongSequenceStorage left, LongSequenceStorage right) {
         boolean doDoubleStorage(DoubleSequenceStorage left, DoubleSequenceStorage right) {
             int llen = left.length();
             int rlen = right.length();
+            if (shortCutFalse(llen, rlen, cmpOp)) {
+                return false;
+            }
             for (int i = 0; i < Math.min(llen, rlen); i++) {
                 double litem = left.getDoubleItemNormalized(i);
                 double ritem = right.getDoubleItemNormalized(i);
@@ -2062,6 +2089,9 @@ boolean doGeneric(VirtualFrame frame, SequenceStorage left, SequenceStorage righ
                         @CachedLibrary(limit = "getCallSiteInlineCacheMaxDepth()") PythonObjectLibrary lib) {
             int llen = getLenNode().execute(left);
             int rlen = getLenNode().execute(right);
+            if (shortCutFalse(llen, rlen, cmpOp)) {
+                return false;
+            }
             ThreadState state;
             if (hasFrame.profile(frame != null)) {
                 state = PArguments.getThreadState(frame);