more correct error messages for weakrefs

timfel · timfel · commit 0dad70626431 · 2019-06-13T09:03:46.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/referencetype/ReferenceTypeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/referencetype/ReferenceTypeBuiltins.java
@@ -103,10 +103,15 @@ public int hash(PReferenceType self) {
             return self.getHash();
         }
 
-        @Fallback
-        public int hash(@SuppressWarnings("unused") Object self) {
+        @Specialization(guards = "self.getObject() == null")
+        public int hashGone(@SuppressWarnings("unused") PReferenceType self) {
             throw raise(PythonErrorType.TypeError, "weak object has gone away");
         }
+
+        @Fallback
+        public int hashWrong(@SuppressWarnings("unused") Object self) {
+            throw raise(PythonErrorType.TypeError, "descriptor '__hash__' requires a 'weakref' object but received a '%p'", self);
+        }
     }
 
     // ref.__repr__

Original file line number	Diff line number	Diff line change
`@@ -103,10 +103,15 @@ public int hash(PReferenceType self) {`
`103`	`103`	`return self.getHash();`
`104`	`104`	`}`
`105`	`105`
`106`		`- @Fallback`
`107`		`- public int hash(@SuppressWarnings("unused") Object self) {`
	`106`	`+ @Specialization(guards = "self.getObject() == null")`
	`107`	`+ public int hashGone(@SuppressWarnings("unused") PReferenceType self) {`
`108`	`108`	`throw raise(PythonErrorType.TypeError, "weak object has gone away");`
`109`	`109`	`}`
	`110`	`+`
	`111`	`+ @Fallback`
	`112`	`+ public int hashWrong(@SuppressWarnings("unused") Object self) {`
	`113`	`+ throw raise(PythonErrorType.TypeError, "descriptor '__hash__' requires a 'weakref' object but received a '%p'", self);`
	`114`	`+ }`
`110`	`115`	`}`
`111`	`116`
`112`	`117`	`// ref.__repr__`