[GR-12537] Object.__ne__ doesn't work correctly.

Author: ppisl

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

@@ -0,0 +1,71 @@
+# Copyright (c) 2018, Oracle and/or its affiliates.
+# Copyright (C) 1996-2017 Python Software Foundation
+#
+# Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+
+import unittest
+
+class First():
+
+    def __init__(self, value):
+        self.value = value
+
+    def __eq__(self, other):
+        return self.value == other.value
+
+class BasicComparisonTest(unittest.TestCase):
+
+    def test_ne(self):
+        x = First(1)
+        y = First(1)
+        z = First(2)
+
+        self.assertIs(x == y, True)
+        self.assertIs(x != y, False)
+        self.assertIs(x != z, True)
+
+    def test_ne_high_priority(self):
+        """object.__ne__() should allow reflected __ne__() to be tried"""
+        calls = []
+
+        class Left:
+            # Inherits object.__ne__()
+            def __eq__(*args):
+                calls.append('Left.__eq__')
+                return NotImplemented
+
+        class Right:
+
+            def __eq__(*args):
+                calls.append('Right.__eq__')
+                return NotImplemented
+
+            def __ne__(*args):
+                calls.append('Right.__ne__')
+                return NotImplemented
+
+        Left() != Right()
+        self.assertSequenceEqual(calls, ['Left.__eq__', 'Right.__ne__'])
+
+    def test_ne_low_priority(self):
+        """object.__ne__() should not invoke reflected __eq__()"""
+        calls = []
+
+        class Base:
+
+            # Inherits object.__ne__()
+            def __eq__(*args):
+                calls.append('Base.__eq__')
+                return NotImplemented
+
+        class Derived(Base):  # Subclassing forces higher priority
+
+            def __eq__(*args):
+                calls.append('Derived.__eq__')
+                return NotImplemented
+            def __ne__(*args):
+                calls.append('Derived.__ne__')
+                return NotImplemented
+
+        Base() != Derived()
+        self.assertSequenceEqual(calls, ['Derived.__ne__', 'Base.__eq__'])

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

@@ -1191,6 +1191,9 @@ private static String toString(byte[] barr) {
     @GenerateNodeFactory
     @SuppressWarnings("unused")
     public abstract static class BoolNode extends PythonBinaryBuiltinNode {
+
+        public abstract boolean executeWith(Object cls, Object val);
+
         @Specialization
         public boolean boolB(Object cls, boolean arg) {
             return arg;
@@ -1225,6 +1228,10 @@ public boolean bool(Object cls, Object obj,
                 throw raise(PythonErrorType.TypeError, "__bool__ should return bool, returned %p", ex.getResult());
             }
         }
+
+        public static BoolNode create() {
+            return BuiltinConstructorsFactory.BoolNodeFactory.create();
+        }
     }
 
     // list([iterable])

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java

@@ -54,7 +54,9 @@
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.builtins.modules.BuiltinConstructors;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.PNotImplemented;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeObject;
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
@@ -196,9 +198,23 @@ public boolean eq(Object self, Object other) {
     @Builtin(name = __NE__, fixedNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     public abstract static class NeNode extends PythonBinaryBuiltinNode {
+
         @Specialization
-        public boolean eq(Object self, Object other) {
-            return self != other;
+        public boolean ne(PythonNativeObject self, PythonNativeObject other) {
+            return !self.object.equals(other.object);
+        }
+
+        @Specialization
+        public Object ne(Object self, Object other,
+                        @Cached("create(__EQ__)") LookupAndCallBinaryNode eqNode,
+                        @Cached("create()") BuiltinConstructors.BoolNode boolNode,
+                        @Cached("create()") GetClassNode getClassNode) {
+            Object result = eqNode.executeObject(self, other);
+            if (result == PNotImplemented.NOT_IMPLEMENTED) {
+                return result;
+            }
+
+            return !boolNode.executeWith(getClassNode.execute(result), result);
         }
     }
 

mx.graalpython/copyrights/overrides

@@ -195,6 +195,7 @@ graalpython/com.oracle.graal.python.test/src/tests/test_call-staticmethod.py,zip
 graalpython/com.oracle.graal.python.test/src/tests/test_call-variable-function.py,zippy.copyright
 graalpython/com.oracle.graal.python.test/src/tests/test_class-chain-check.py,zippy.copyright
 graalpython/com.oracle.graal.python.test/src/tests/test_codecs.py,python.copyright
+graalpython/com.oracle.graal.python.test/src/tests/test_compare.py,python.copyright
 graalpython/com.oracle.graal.python.test/src/tests/test_enumerate.py,python.copyright
 graalpython/com.oracle.graal.python.test/src/tests/test_euler11.py,benchmarks.copyright
 graalpython/com.oracle.graal.python.test/src/tests/test_euler31.py,benchmarks.copyright