[GR-23207] Various fixes for test_class

msimacek · msimacek · commit c4cb66f86194 · 2020-07-15T09:47:59.000Z
PullRequest: graalpython/1119
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_class.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_class.txt
@@ -1,8 +1,12 @@
 *graalpython.lib-python.3.test.test_class.ClassTests.testBadTypeReturned
+*graalpython.lib-python.3.test.test_class.ClassTests.testBinaryOps
 *graalpython.lib-python.3.test.test_class.ClassTests.testForExceptionsRaisedInInstanceGetattr2
 *graalpython.lib-python.3.test.test_class.ClassTests.testGetSetAndDel
+*graalpython.lib-python.3.test.test_class.ClassTests.testHashStuff
 *graalpython.lib-python.3.test.test_class.ClassTests.testInit
+*graalpython.lib-python.3.test.test_class.ClassTests.testListAndDictOps
 *graalpython.lib-python.3.test.test_class.ClassTests.testMisc
 *graalpython.lib-python.3.test.test_class.ClassTests.testSFBug532646
+*graalpython.lib-python.3.test.test_class.ClassTests.testSetattrNonStringName
 *graalpython.lib-python.3.test.test_class.ClassTests.testSetattrWrapperNameIntern
 *graalpython.lib-python.3.test.test_class.ClassTests.testUnaryOps
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java
@@ -71,6 +71,8 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__WEAKREF__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.DECODE;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__COMPLEX__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__EQ__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__HASH__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INDEX__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
@@ -2332,6 +2334,16 @@ private PythonClass typeMetaclass(VirtualFrame frame, String name, PTuple bases,
                 }
             }
 
+            // CPython masks the __hash__ method with None when __eq__ is overriden, but __hash__ is
+            // not
+            Object hashMethod = nslib.getItem(namespace.getDictStorage(), __HASH__);
+            if (hashMethod == null) {
+                Object eqMethod = nslib.getItem(namespace.getDictStorage(), __EQ__);
+                if (eqMethod != null) {
+                    pythonClass.setAttribute(__HASH__, PNone.NONE);
+                }
+            }
+
             boolean addDict = false;
             if (slots == null) {
                 // takes care of checking if we may_add_dict and adds it if needed
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java
@@ -524,12 +524,13 @@ public PTuple doDouble(double a, double b) {
         }
 
         @Specialization
-        public PTuple doObject(VirtualFrame frame, Object a, Object b,
-                        @Cached("FloorDiv.create()") LookupAndCallBinaryNode floordivNode,
-                        @Cached("Mod.create()") LookupAndCallBinaryNode modNode) {
-            Object div = floordivNode.executeObject(frame, a, b);
-            Object mod = modNode.executeObject(frame, a, b);
-            return factory().createTuple(new Object[]{div, mod});
+        public Object doObject(VirtualFrame frame, Object a, Object b,
+                        @Cached("createDivmod()") LookupAndCallBinaryNode callDivmod) {
+            return callDivmod.executeObject(frame, a, b);
+        }
+
+        protected static LookupAndCallBinaryNode createDivmod() {
+            return BinaryArithmetic.DivMod.create();
         }
 
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/complex/ComplexBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/complex/ComplexBuiltins.java
@@ -59,6 +59,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__POS__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__POW__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RADD__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__RDIVMOD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RMUL__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RPOW__;
@@ -401,6 +402,7 @@ PNotImplemented doComplex(Object left, Object right) {
     }
 
     @GenerateNodeFactory
+    @Builtin(name = __RDIVMOD__, minNumOfPositionalArgs = 2, reverseOperation = true)
     @Builtin(name = __DIVMOD__, minNumOfPositionalArgs = 2)
     abstract static class DivModNode extends PythonBinaryBuiltinNode {
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java
@@ -25,12 +25,13 @@
  */
 package com.oracle.graal.python.builtins.objects.floats;
 
-import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.OverflowError;
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ValueError;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ABS__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ADD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__BOOL__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__DIVMOD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__EQ__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__FLOAT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__FLOORDIV__;
@@ -48,6 +49,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__POS__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__POW__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RADD__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__RDIVMOD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RFLOORDIV__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RMOD__;
@@ -598,6 +600,47 @@ PNotImplemented doGeneric(Object left, Object right) {
         }
     }
 
+    @Builtin(name = __RDIVMOD__, minNumOfPositionalArgs = 2, reverseOperation = true)
+    @Builtin(name = __DIVMOD__, minNumOfPositionalArgs = 2)
+    @TypeSystemReference(PythonArithmeticTypes.class)
+    @GenerateNodeFactory
+    abstract static class DivModNode extends FloatBinaryBuiltinNode {
+        @Specialization
+        PTuple doDL(double left, long right) {
+            raiseDivisionByZero(right == 0);
+            return factory().createTuple(new Object[]{Math.floor(left / right), left % right});
+        }
+
+        @Specialization
+        PTuple doDD(double left, double right) {
+            raiseDivisionByZero(right == 0.0);
+            return factory().createTuple(new Object[]{Math.floor(left / right), left % right});
+        }
+
+        @Specialization
+        PTuple doLD(long left, double right) {
+            raiseDivisionByZero(right == 0.0);
+            return factory().createTuple(new Object[]{Math.floor(left / right), left % right});
+        }
+
+        @Specialization(guards = {"accepts(left)", "accepts(right)"})
+        PTuple doGenericFloat(VirtualFrame frame, Object left, Object right,
+                        @Cached FloorDivNode floorDivNode,
+                        @Cached ModNode modNode) {
+            return factory().createTuple(new Object[]{floorDivNode.execute(frame, left, right), modNode.execute(frame, left, right)});
+        }
+
+        @SuppressWarnings("unused")
+        @Fallback
+        PNotImplemented doGeneric(Object left, Object right) {
+            return PNotImplemented.NOT_IMPLEMENTED;
+        }
+
+        protected static boolean accepts(Object obj) {
+            return obj instanceof Double || obj instanceof Integer || obj instanceof Long || obj instanceof PInt || obj instanceof PFloat;
+        }
+    }
+
     @Builtin(name = SpecialMethodNames.__HASH__, minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     @TypeSystemReference(PythonArithmeticTypes.class)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/ForeignObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/ForeignObjectBuiltins.java
@@ -35,6 +35,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__DELATTR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__DELITEM__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__DIR__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__DIVMOD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__EQ__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__FLOORDIV__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTR__;
@@ -50,6 +51,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEW__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__NE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RADD__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__RDIVMOD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RFLOORDIV__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RMUL__;
@@ -415,6 +417,22 @@ abstract static class RFloorDivNode extends ForeignBinaryNode {
         }
     }
 
+    @Builtin(name = __DIVMOD__, minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    abstract static class DivModNode extends ForeignBinaryNode {
+        DivModNode() {
+            super(BinaryArithmetic.DivMod.create(), false);
+        }
+    }
+
+    @Builtin(name = __RDIVMOD__, minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    abstract static class RDivModNode extends ForeignBinaryNode {
+        RDivModNode() {
+            super(BinaryArithmetic.DivMod.create(), true);
+        }
+    }
+
     public abstract static class ForeignBinaryComparisonNode extends PythonBinaryBuiltinNode {
         @Child private BinaryComparisonNode comparisonNode;
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java
@@ -609,6 +609,41 @@ PNotImplemented doGeneric(Object right, Object left) {
 
     }
 
+    @Builtin(name = SpecialMethodNames.__RDIVMOD__, minNumOfPositionalArgs = 2, reverseOperation = true)
+    @Builtin(name = SpecialMethodNames.__DIVMOD__, minNumOfPositionalArgs = 2)
+    @TypeSystemReference(PythonArithmeticTypes.class)
+    @GenerateNodeFactory
+    abstract static class DivModNode extends IntBinaryBuiltinNode {
+        @Specialization
+        PTuple doLL(int left, int right) {
+            raiseDivisionByZero(right == 0);
+            return factory().createTuple(new Object[]{Math.floorDiv(left, right), Math.floorMod(left, right)});
+        }
+
+        @Specialization
+        PTuple doLL(long left, long right) {
+            raiseDivisionByZero(right == 0);
+            return factory().createTuple(new Object[]{Math.floorDiv(left, right), Math.floorMod(left, right)});
+        }
+
+        @Specialization(guards = {"accepts(left)", "accepts(right)"})
+        PTuple doGenericInt(VirtualFrame frame, Object left, Object right,
+                        @Cached FloorDivNode floorDivNode,
+                        @Cached ModNode modNode) {
+            return factory().createTuple(new Object[]{floorDivNode.execute(frame, left, right), modNode.execute(frame, left, right)});
+        }
+
+        @SuppressWarnings("unused")
+        @Fallback
+        PNotImplemented doGeneric(Object left, Object right) {
+            return PNotImplemented.NOT_IMPLEMENTED;
+        }
+
+        protected static boolean accepts(Object obj) {
+            return obj instanceof Integer || obj instanceof Long || obj instanceof PInt;
+        }
+    }
+
     @Builtin(name = SpecialMethodNames.__MOD__, minNumOfPositionalArgs = 2)
     @TypeSystemReference(PythonArithmeticTypes.class)
     @GenerateNodeFactory
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java
@@ -70,6 +70,7 @@
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.object.ObjectBuiltinsFactory.GetAttributeNodeFactory;
+import com.oracle.graal.python.builtins.objects.str.StringNodes;
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes;
@@ -616,13 +617,15 @@ public static GetAttributeNode create() {
     @GenerateNodeFactory
     public abstract static class SetattrNode extends PythonTernaryBuiltinNode {
         @Specialization(limit = "3")
-        protected PNone doIt(VirtualFrame frame, Object object, Object key, Object value,
+        protected PNone doIt(VirtualFrame frame, Object object, Object keyObject, Object value,
                         @CachedLibrary("object") PythonObjectLibrary libObj,
+                        @Cached StringNodes.CastToJavaStringCheckedNode castToString,
                         @Cached("create()") LookupAttributeInMRONode.Dynamic getExisting,
                         @Cached("create()") GetClassNode getDataClassNode,
                         @Cached("create(__SET__)") LookupAttributeInMRONode lookupSetNode,
                         @Cached("create()") CallTernaryMethodNode callSetNode,
                         @Cached("create()") WriteAttributeToObjectNode writeNode) {
+            String key = castToString.cast(keyObject, "attribute name must be string, not '%p'", keyObject);
             Object type = libObj.getLazyPythonClass(object);
             Object descr = getExisting.execute(type, key);
             if (descr != PNone.NO_VALUE) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryArithmetic.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryArithmetic.java
@@ -64,7 +64,8 @@ public enum BinaryArithmetic {
     Or(SpecialMethodNames.__OR__, "|"),
     Xor(SpecialMethodNames.__XOR__, "^"),
     MatMul(SpecialMethodNames.__MATMUL__, "@"),
-    Pow(SpecialMethodNames.__POW__, "**");
+    Pow(SpecialMethodNames.__POW__, "**"),
+    DivMod(SpecialMethodNames.__DIVMOD__, "divmod");
 
     private final String methodName;
     private final String reverseMethodName;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/SliceLiteralNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/subscript/SliceLiteralNode.java
@@ -104,7 +104,7 @@ private int castStop(VirtualFrame frame, Object o) {
     private int castStep(VirtualFrame frame, Object o) {
         if (castStepNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            castStepNode = insert(CastToSliceComponentNode.create(1, Integer.MAX_VALUE));
+            castStepNode = insert(CastToSliceComponentNode.create(MISSING_INDEX, Integer.MAX_VALUE));
         }
         return castStepNode.execute(frame, o);
     }

Original file line number	Diff line number	Diff line change
`@@ -524,12 +524,13 @@ public PTuple doDouble(double a, double b) {`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`@Specialization`
`527`		`- public PTuple doObject(VirtualFrame frame, Object a, Object b,`
`528`		`- @Cached("FloorDiv.create()") LookupAndCallBinaryNode floordivNode,`
`529`		`- @Cached("Mod.create()") LookupAndCallBinaryNode modNode) {`
`530`		`- Object div = floordivNode.executeObject(frame, a, b);`
`531`		`- Object mod = modNode.executeObject(frame, a, b);`
`532`		`- return factory().createTuple(new Object[]{div, mod});`
	`527`	`+ public Object doObject(VirtualFrame frame, Object a, Object b,`
	`528`	`+ @Cached("createDivmod()") LookupAndCallBinaryNode callDivmod) {`
	`529`	`+ return callDivmod.executeObject(frame, a, b);`
	`530`	`+ }`
	`531`	`+`
	`532`	`+ protected static LookupAndCallBinaryNode createDivmod() {`
	`533`	`+ return BinaryArithmetic.DivMod.create();`
`533`	`534`	`}`
`534`	`535`
`535`	`536`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ private int castStop(VirtualFrame frame, Object o) {`
`104`	`104`	`private int castStep(VirtualFrame frame, Object o) {`
`105`	`105`	`if (castStepNode == null) {`
`106`	`106`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`107`		`- castStepNode = insert(CastToSliceComponentNode.create(1, Integer.MAX_VALUE));`
	`107`	`+ castStepNode = insert(CastToSliceComponentNode.create(MISSING_INDEX, Integer.MAX_VALUE));`
`108`	`108`	`}`
`109`	`109`	`return castStepNode.execute(frame, o);`
`110`	`110`	`}`