[GR-45421] [GR-45312] Fix/work around various issues encountered in packages.

PullRequest: graalpython/2725

Author: lukasstadler

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_object.py

@@ -153,6 +153,39 @@ def test_index(self):
         tester = TestIndex()
         assert [0, 1][tester] == 1
 
+    def test_slots_binops(self):
+        TestSlotsBinop = CPyExtType("TestSlotsBinop",
+                             """
+                             PyObject* test_int_impl(PyObject* self) {
+                                 PyErr_SetString(PyExc_RuntimeError, "Should not call __int__");
+                                 return NULL;
+                             }
+                             PyObject* test_index_impl(PyObject* self) {
+                                 PyErr_SetString(PyExc_RuntimeError, "Should not call __index__");
+                                 return NULL;
+                             }
+                             PyObject* test_mul_impl(PyObject* a, PyObject* b) {
+                                 return PyLong_FromLong(42);
+                             }
+                             """,
+                             nb_int="test_int_impl",
+                             nb_index="test_index_impl",
+                             nb_multiply="test_mul_impl"
+        )
+        assert [4, 2] * TestSlotsBinop() == 42
+
+    def test_index(self):
+        TestIndex = CPyExtType("TestIndex",
+                             """
+                             PyObject* test_index(PyObject* self) {
+                                 return PyLong_FromLong(1);
+                             }
+                             """,
+                             nb_index="test_index"
+        )
+        tester = TestIndex()
+        assert [0, 1][tester] == 1
+
     def test_getattro(self):
         return  # TODO: not working yet
         # XXX: Cludge to get type into C

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 # Copyright (C) 1996-2020 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -90,4 +90,22 @@ def test_builtin_constants(self):
 
     def test_min(self):
         self.assertEqual(min((), default=1, key="adsf"), 1)
+
+    def test_sort_keyfunc(self):
+        lists = [[], [1], [1,2], [1,2,3], [1,3,2], [3,2,1], [9,3,8,1,7,9,3,6,7,8]]
 
+        for l in lists:
+            count = 0
+            
+            def keyfunc(v):
+                nonlocal count
+                count += 1
+                return v
+            
+            result = sorted(l, key = keyfunc)
+            self.assertEqual(len(l), count)
+            self.assertEqual(sorted(l), result)
+            count = 0
+            result = sorted(l, key = keyfunc, reverse = True)
+            self.assertEqual(len(l), count)
+            self.assertEqual(sorted(l, reverse = True), result)       

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

@@ -376,6 +376,11 @@ public static KeySortComparator forClass(Class<?> clazz) {
         }
 
         private void sortWithKey(VirtualFrame frame, Object[] array, int len, Object keyfunc, boolean reverse, CallNode callNode, CallContext callContext) {
+            if (len == 0) {
+                return;
+            }
+            // some packages expect "keyfunc" to be called even for one-element lists
+            Object key = callNode.execute(frame, keyfunc, array[0]);
             if (len <= 1) {
                 return;
             }
@@ -391,7 +396,6 @@ private void sortWithKey(VirtualFrame frame, Object[] array, int len, Object key
              * Look at the first key and determine which comparator we could use to compare if the
              * keys turn all to be the same primitive type
              */
-            Object key = callNode.execute(frame, keyfunc, array[0]);
             pairArray[reverse ? len - 1 : 0] = new SortingPair(key, array[0]);
             Class<?> keyClass = keyClassProfile.profile(key.getClass());
             KeySortComparator keySortComparator = KeySortComparator.forClass(keyClass);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallReversibleBinaryNode.java

@@ -216,7 +216,11 @@ private Object doCallObjectR(VirtualFrame frame, Node inliningTarget, Object lef
         if (hasLeftCallable.profile(inliningTarget, leftCallable != PNone.NO_VALUE)) {
             if (hasRightCallable.profile(inliningTarget, rightCallable != PNone.NO_VALUE) &&
                             (!isSameTypeNode.execute(inliningTarget, leftClass, rightClass) && isSubtype.execute(frame, rightClass, leftClass) ||
-                                            isFlagSequenceCompat(inliningTarget, leftClass, rightClass, slot, noLeftBuiltinClassType, noRightBuiltinClassType))) {
+                                            isFlagSequenceCompat(inliningTarget, leftClass, rightClass, slot, noLeftBuiltinClassType, noRightBuiltinClassType) ||
+                                            // this condition is a quick fix for the fact that
+                                            // CPython tries both normal and reverse nb_multiply
+                                            // before trying sq_repeat (happens in numpy):
+                                            (slot == SpecialMethodSlot.Mul && leftClass == PythonBuiltinClassType.PList))) {
                 result = dispatch(frame, inliningTarget, ensureReverseDispatch(), rightCallable, right, left, rightClass, rslot, isSubtype, getEnclosingType);
                 if (result != PNotImplemented.NOT_IMPLEMENTED) {
                     return result;