Add missing __hash__ method to method types

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/AbstractMethodBuiltins.java

@@ -33,6 +33,7 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__SELF__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__CALL__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__EQ__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__HASH__;
 
 import java.util.List;
 
@@ -137,6 +138,20 @@ boolean eq(@SuppressWarnings("unused") Object self, @SuppressWarnings("unused")
         }
     }
 
+    @Builtin(name = __HASH__, minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    abstract static class HashNode extends PythonUnaryBuiltinNode {
+        @Specialization
+        static long hash(PMethod self) {
+            return self.hash();
+        }
+
+        @Specialization
+        static long hash(PBuiltinMethod self) {
+            return self.hash();
+        }
+    }
+
     @Builtin(name = __MODULE__, minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, isGetter = true, isSetter = true)
     @GenerateNodeFactory
     abstract static class GetModuleNode extends PythonBinaryBuiltinNode {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/PBuiltinMethod.java

@@ -74,8 +74,12 @@ boolean isHashable() {
         return true;
     }
 
+    public long hash() {
+        return PythonAbstractObject.systemHashCode(this.getSelf()) ^ PythonAbstractObject.systemHashCode(this.getFunction());
+    }
+
     @ExportMessage
     protected long hashWithState(@SuppressWarnings("unused") ThreadState state) {
-        return PythonAbstractObject.systemHashCode(this.getSelf()) ^ PythonAbstractObject.systemHashCode(this.getFunction());
+        return hash();
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/PMethod.java

@@ -87,8 +87,12 @@ boolean isHashable() {
         return true;
     }
 
+    public long hash() {
+        return PythonAbstractObject.systemHashCode(this.getSelf()) ^ PythonAbstractObject.systemHashCode(this.getFunction());
+    }
+
     @ExportMessage
     protected long hashWithState(@SuppressWarnings("unused") ThreadState state) {
-        return PythonAbstractObject.systemHashCode(this.getSelf()) ^ PythonAbstractObject.systemHashCode(this.getFunction());
+        return hash();
     }
 }