Fix: incorrect signature used for 'wrap_hashfunc'.

fangerer · fangerer · commit 2359eafd0a6e · 2019-07-19T13:22:40.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/typeobject.c b/graalpython/com.oracle.graal.python.cext/src/typeobject.c
@@ -170,8 +170,12 @@ static PyObject* wrap_lenfunc(lenfunc f, PyObject* a) {
     return PyLong_FromSsize_t(f(a));
 }
 
-static Py_hash_t wrap_hashfunc(hashfunc f, PyObject* a) {
-    return PyLong_FromSsize_t(f(a));
+static PyObject* wrap_hashfunc(hashfunc f, PyObject* a) {
+    Py_hash_t res = f(a);
+    if (res == -1 && PyErr_Occurred()) {
+        return NULL;
+    }
+    return PyLong_FromSsize_t(res);
 }
 
 static PyObject* wrap_reverse_binop(binaryfunc f, PyObject* a, PyObject* b) {

Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,12 @@ static PyObject* wrap_lenfunc(lenfunc f, PyObject* a) {`
`170`	`170`	`return PyLong_FromSsize_t(f(a));`
`171`	`171`	`}`
`172`	`172`
`173`		`-static Py_hash_t wrap_hashfunc(hashfunc f, PyObject* a) {`
`174`		`- return PyLong_FromSsize_t(f(a));`
	`173`	`+static PyObject* wrap_hashfunc(hashfunc f, PyObject* a) {`
	`174`	`+ Py_hash_t res = f(a);`
	`175`	`+ if (res == -1 && PyErr_Occurred()) {`
	`176`	`+ return NULL;`
	`177`	`+ }`
	`178`	`+ return PyLong_FromSsize_t(res);`
`175`	`179`	`}`
`176`	`180`
`177`	`181`	`static PyObject* wrap_reverse_binop(binaryfunc f, PyObject* a, PyObject* b) {`