Skip to content

Commit d30fd3d

Browse files
committed
unwrap return values from member getters
1 parent e82d516 commit d30fd3d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

graalpython/com.oracle.graal.python.cext/src/capi.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,16 +358,16 @@ int ReadByteMember(PyObject* object, Py_ssize_t offset) {
358358
return ReadMember(object, offset, char);
359359
}
360360

361-
PyObject* ReadUByteMember(PyObject* object, Py_ssize_t offset) {
362-
return PyLong_FromUnsignedLong(ReadMember(object, offset, unsigned char));
361+
int ReadUByteMember(PyObject* object, Py_ssize_t offset) {
362+
return ReadMember(object, offset, unsigned char);
363363
}
364364

365-
PyObject* ReadUShortMember(PyObject* object, Py_ssize_t offset) {
366-
return PyLong_FromUnsignedLong(ReadMember(object, offset, unsigned short));
365+
int ReadUShortMember(PyObject* object, Py_ssize_t offset) {
366+
return ReadMember(object, offset, unsigned short);
367367
}
368368

369-
PyObject* ReadUIntMember(PyObject* object, Py_ssize_t offset) {
370-
return PyLong_FromUnsignedLong(ReadMember(object, offset, unsigned int));
369+
long ReadUIntMember(PyObject* object, Py_ssize_t offset) {
370+
return ReadMember(object, offset, unsigned int);
371371
}
372372

373373
PyObject* ReadULongMember(PyObject* object, Py_ssize_t offset) {

graalpython/lib-graalpython/python_cext.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ def AddMember(primary, name, memberType, offset, canSet, doc):
740740
member = property()
741741
getter = ReadMemberFunctions[memberType]
742742
def member_getter(self):
743-
return getter(to_sulong(self), TrufflePInt_AsPrimitive(offset, 1, 8, ""))
743+
return to_java(getter(to_sulong(self), TrufflePInt_AsPrimitive(offset, 1, 8, "")))
744744
member.getter(member_getter)
745745
if to_java(canSet):
746746
setter = WriteMemberFunctions[memberType]

0 commit comments

Comments
 (0)