replace weakref.__hash__ hashfunction call and coercion with object library

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/referencetype/ReferenceTypeBuiltins.java

@@ -53,15 +53,14 @@
 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.BuiltinFunctions.IsInstanceNode;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.function.PArguments;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
-import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.expression.BinaryComparisonNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
-import com.oracle.graal.python.nodes.util.CoerceToJavaLongNode;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
@@ -70,6 +69,8 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @CoreFunctions(extendClasses = PythonBuiltinClassType.PReferenceType)
 public class ReferenceTypeBuiltins extends PythonBuiltins {
@@ -109,29 +110,19 @@ long getHash(PReferenceType self) {
             return self.getHash();
         }
 
-        @Specialization(guards = {
-                        "self.getObject() != null",
-                        "self.getHash() == HASH_UNSET"
-        })
+        @Specialization(guards = "self.getHash() == HASH_UNSET")
         long computeHash(VirtualFrame frame, PReferenceType self,
-                        @Cached("create(__HASH__)") LookupAndCallUnaryNode dispatchHash,
-                        @Cached IsInstanceNode isInstanceNode,
-                        @Cached("createLossy()") CoerceToJavaLongNode castToLongNode) {
+                        @Cached("createBinaryProfile()") ConditionProfile referentProfile,
+                        // n.b.: we cannot directly specialize on lib.getObject() here, because it might go away in the meantime!
+                        @CachedLibrary(limit = "getCallSiteInlineCacheMaxDepth()") PythonObjectLibrary lib) {
             Object referent = self.getObject();
-            Object hashValue = dispatchHash.executeObject(frame, referent);
-            if (!isInstanceNode.executeWith(frame, hashValue, getBuiltinPythonClass(PythonBuiltinClassType.PInt))) {
-                throw raise(PythonErrorType.TypeError, "__hash__ method should return an integer");
+            if (referentProfile.profile(referent != null)) {
+                long hash = lib.hashWithState(referent, PArguments.getThreadState(frame));
+                self.setHash(hash);
+                return hash;
+            } else {
+                throw raise(PythonErrorType.TypeError, "weak object has gone away");
             }
-
-            long hash = castToLongNode.execute(hashValue);
-            self.setHash(hash);
-            return hash;
-        }
-
-        @Specialization(guards = {"self.getObject() == null", "self.getHash() == HASH_UNSET"})
-        @SuppressWarnings("unused")
-        int hashGone(VirtualFrame frame, PReferenceType self) {
-            throw raise(PythonErrorType.TypeError, "weak object has gone away");
         }
 
         @Fallback