[GR-36492] Fix PIntSlice.__eq__ and PySequenceArrayWrapper#GetTypeIDNode.

PullRequest: graalpython/2114

Author: steve-s

graalpython/com.oracle.graal.python.test/src/tests/test_slice.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 # Copyright (c) 2013, Regents of the University of California
 #
 # All rights reserved.
@@ -194,3 +194,11 @@ def __index__(self):
         [1][:"42"]
     except TypeError as e:
         assert "slice indices must be integers" in str(e)
+
+
+def test_slice_eq():
+    # Note: large numbers that do not get interned when boxed...
+    assert slice(2, 10000, 10) == slice(2, 10000, 10)
+    assert slice(None, 12345, 10) == slice(None, 12345, 10)
+    assert slice(1, 10000, 10) != slice(None, 10000, 10)
+    assert slice(2, 10000, 10) != slice(2, 10000, 1)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PySequenceArrayWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -517,7 +517,7 @@ Object doByteArrayMultiCtx(@SuppressWarnings("unused") Object object,
         }
 
         @Specialization(guards = "!hasByteArrayContent(object)", replaces = "doPtrArray")
-        Object doPtrArrayMultiCtx(@SuppressWarnings("unused") PSequence object,
+        Object doPtrArrayMultiCtx(@SuppressWarnings("unused") Object object,
                         @Shared("callUnaryNode") @Cached PCallCapiFunction callUnaryNode) {
             return callUnaryNode.call(FUN_GET_PTR_ARRAY_TYPE_ID, 0);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PIntSlice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -42,6 +42,7 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.truffle.api.CompilerAsserts;
 
 public final class PIntSlice extends PSlice {
 
@@ -99,4 +100,18 @@ public final Object getStep() {
     public SliceInfo computeIndices(int length) {
         return computeIndices(getStart(), stop, getStep(), length);
     }
+
+    public boolean equals(PIntSlice other) {
+        return start == other.start && stop == other.stop && step == other.step && startIsNone == other.startIsNone && stepIsNone == other.stepIsNone;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        CompilerAsserts.neverPartOfCompilation();
+        if (obj instanceof PIntSlice) {
+            return equals((PIntSlice) obj);
+        } else {
+            return super.equals(obj);
+        }
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PSlice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -64,18 +64,20 @@ public String toString() {
 
     @Override
     public boolean equals(Object obj) {
+        CompilerAsserts.neverPartOfCompilation();
         if (!(obj instanceof PSlice)) {
             return false;
         }
         if (this == obj) {
             return true;
         }
         PSlice other = (PSlice) obj;
-        return (this.getStart() == other.getStart() && this.getStop() == other.getStop() && this.getStep() == other.getStep());
+        return (this.getStart().equals(other.getStart()) && this.getStop().equals(other.getStop()) && this.getStep().equals(other.getStep()));
     }
 
     @Override
     public int hashCode() {
+        CompilerAsserts.neverPartOfCompilation();
         return Objects.hash(this.getStart(), this.getStop(), this.getStep());
     }