Fix IsHashable node hash value type check (must be an int), fix DictBuiltins setdefault

- unittest cleanup

Author: cosminbasca

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

@@ -348,7 +348,6 @@ def test_dictview_mixed_set_operations():
 def test_setdefault():
     # dict.setdefault()
     d = {}
-    none = d.setdefault('key0')
     assert d.setdefault('key0') is None
     d.setdefault('key0', [])
     assert d.setdefault('key0') is None

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java

@@ -68,6 +68,7 @@
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @CoreFunctions(extendClasses = PDict.class)
 public final class DictBuiltins extends PythonBuiltins {
@@ -129,20 +130,16 @@ public Object setDefault(PDict dict, Object key, @SuppressWarnings("unused") Obj
             return getItemNode.execute(dict.getDictStorage(), key);
         }
 
-        @Specialization(guards = "!containsKey(dict.getDictStorage(), key)")
-        public Object setDefault(PDict dict, Object key, @SuppressWarnings("unused") PNone defaultValue,
-                        @Cached("create()") HashingStorageNodes.SetItemNode setItemNode) {
-
-            setItemNode.execute(dict, dict.getDictStorage(), key, PNone.NONE);
-            return PNone.NONE;
-        }
-
         @Specialization(guards = "!containsKey(dict.getDictStorage(), key)")
         public Object setDefault(PDict dict, Object key, Object defaultValue,
-                        @Cached("create()") HashingStorageNodes.SetItemNode setItemNode) {
-
-            setItemNode.execute(dict, dict.getDictStorage(), key, defaultValue);
-            return defaultValue;
+                        @Cached("create()") HashingStorageNodes.SetItemNode setItemNode,
+                        @Cached("createBinaryProfile()") ConditionProfile defaultValProfile) {
+            Object value = defaultValue;
+            if (defaultValProfile.profile(defaultValue == PNone.NO_VALUE)) {
+                value = PNone.NONE;
+            }
+            setItemNode.execute(dict, dict.getDictStorage(), key, value);
+            return value;
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/datamodel/IsHashableNode.java

@@ -38,14 +38,20 @@
  */
 package com.oracle.graal.python.nodes.datamodel;
 
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.modules.BuiltinFunctions;
+import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 
 public abstract class IsHashableNode extends PDataModelEmulationNode {
+    protected PythonClass getBuiltinIntType() {
+        return getCore().lookupType(PythonBuiltinClassType.PInt);
+    }
+
     protected boolean isDouble(Object object) {
         return object instanceof Double || PGuards.isPFloat(object);
     }
@@ -68,9 +74,10 @@ protected boolean isHashableGeneric(@SuppressWarnings("unused") Object object) {
     @Specialization
     protected boolean isHashableGeneric(Object object,
                     @Cached("create(__HASH__)") LookupAndCallUnaryNode lookupHashAttributeNode,
-                    @Cached("createBinaryProfile()") ConditionProfile isIntHashProfile) {
+                    @Cached("create()") BuiltinFunctions.IsInstanceNode isInstanceNode,
+                    @Cached("getBuiltinIntType()") PythonClass IntType) {
         Object hashValue = lookupHashAttributeNode.executeObject(object);
-        if (isIntHashProfile.profile(hashValue instanceof Integer)) {
+        if (isInstanceNode.executeWith(hashValue, IntType)) {
             return true;
         }
         throw raise(PythonErrorType.TypeError, "__hash__ method should return an integer");