Implement the builtin hash with the library

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -461,7 +461,7 @@ static boolean isMappingType(PythonBuiltinClassType type,
     @ExportMessage
     static long hash(PythonBuiltinClassType type,
                     @CachedContext(PythonLanguage.class) PythonContext context,
-                    @CachedLibrary(limit = "1") PythonObjectLibrary lib) throws UnsupportedMessageException {
+                    @CachedLibrary(limit = "1") PythonObjectLibrary lib) {
         return lib.hash(context.getCore().lookupType(type));
     }
 

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

@@ -139,7 +139,6 @@
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.call.GenericInvokeNode;
 import com.oracle.graal.python.nodes.call.PythonCallNode;
-import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallTernaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
@@ -490,39 +489,19 @@ public char charFromObject(Object arg) {
         }
     }
 
-    // hash([object])
+    // hash(object)
     @Builtin(name = HASH, minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     public abstract static class HashNode extends PythonUnaryBuiltinNode {
-        @Specialization  // tfel: TODO: this shouldn't be needed!
-        Object hash(PException exception) {
-            return exception.hashCode();
-        }
-
-        protected boolean isPException(Object object) {
-            return object instanceof PException;
-        }
-
-        @Specialization(guards = "!isPException(object)")
-        Object hash(VirtualFrame frame, Object object,
-                        @Cached("create(__DIR__)") LookupInheritedAttributeNode lookupDirNode,
-                        @Cached("create(__HASH__)") LookupInheritedAttributeNode lookupHash,
-                        @CachedLibrary(limit = "1") PythonObjectLibrary dataModelLibrary,
-                        @Cached CallUnaryMethodNode callUnary,
-                        @Cached("createIfTrueNode()") CastToBooleanNode trueNode,
-                        @Cached IsInstanceNode isInstanceNode) {
-            if (trueNode.executeBoolean(frame, lookupDirNode.execute(object))) {
-                Object hashAttr = lookupHash.execute(object);
-                if (!dataModelLibrary.isCallable(hashAttr)) {
-                    throw raise(PythonErrorType.TypeError, "unhashable type: '%p'", object);
-                }
-                Object hashValue = callUnary.executeObject(frame, hashAttr, object);
-                if (isInstanceNode.executeWith(frame, hashValue, getBuiltinPythonClass(PythonBuiltinClassType.PInt))) {
-                    return hashValue;
-                }
-                throw raise(PythonErrorType.TypeError, "__hash__ method should return an integer");
+        @Specialization(limit = "getCallSiteInlineCacheMaxDepth()")
+        long hash(VirtualFrame frame, Object object,
+                        @Cached("createBinaryProfile()") ConditionProfile profile,
+                        @CachedLibrary("object") PythonObjectLibrary lib) {
+            if (profile.profile(frame != null)) {
+                return lib.hashWithState(object, PArguments.getThreadState(frame));
+            } else {
+                return lib.hash(object);
             }
-            return object.hashCode();
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -108,6 +108,7 @@
 import com.oracle.graal.python.nodes.object.GetLazyClassNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.util.CastToJavaIntNode;
+import com.oracle.graal.python.nodes.util.CastToJavaLongNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -675,24 +676,22 @@ public long hashWithState(ThreadState state,
                     @Exclusive @Cached LookupInheritedAttributeNode.Dynamic lookupHashAttributeNode,
                     @Exclusive @Cached CallNode callNode,
                     @Exclusive @Cached PRaiseNode raise,
-                    @CachedLibrary(limit = "1") PythonObjectLibrary lib,
-                    @CachedLibrary(limit = "1") InteropLibrary interopLib) {
+                    @Cached CastToJavaLongNode castToLong,
+                    @CachedLibrary(limit = "1") PythonObjectLibrary lib) {
         Object hashAttr = getHashAttr(lookupHashAttributeNode, raise, lib);
         Object result;
         if (gotState.profile(state == null)) {
             result = callNode.execute(hashAttr, this);
         } else {
             result = callNode.execute(PArguments.frameForCall(state), hashAttr, this);
         }
-        if (interopLib.fitsInLong(hashAttr)) {
-            try {
-                return interopLib.asLong(result);
-            } catch (UnsupportedMessageException e) {
-                CompilerDirectives.transferToInterpreter();
-                throw new IllegalStateException(e);
-            }
+        // see PyObject_GetHash and slot_tp_hash in CPython. The result of the
+        // hash call is always a plain long, forcibly and lossy read from memory.
+        try {
+            return castToLong.execute(result);
+        } catch (CastToJavaLongNode.CannotCastException e) {
+            throw raise.raise(PythonBuiltinClassType.TypeError, "__hash__ method should return an integer");
         }
-        throw raise.raise(PythonBuiltinClassType.TypeError, "__hash__ method should return an integer");
     }
 
     private Object getHashAttr(LookupInheritedAttributeNode.Dynamic lookupHashAttributeNode, PRaiseNode raise, PythonObjectLibrary lib) {

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

@@ -198,9 +198,9 @@ public boolean isHashable(Object receiver) {
      * call. It ensures that we can use fastcalls and pass the thread state in
      * the frame arguments.
      */
-    public long hashWithState(Object receiver, ThreadState threadState) throws UnsupportedMessageException {
+    public long hashWithState(Object receiver, ThreadState threadState) {
         if (threadState == null) {
-            throw UnsupportedMessageException.create();
+            throw new AbstractMethodError();
         }
         return hash(receiver);
     }
@@ -210,7 +210,7 @@ public long hashWithState(Object receiver, ThreadState threadState) throws Unsup
      * Python {@link Frame} is available to the caller, {@link #hashWithState}
      * should be preferred.
      */
-    public long hash(Object receiver) throws UnsupportedMessageException {
+    public long hash(Object receiver) {
         return hashWithState(receiver, null);
     }