Skip to content

[GR-79862] Fix inherited native weak reference offset. #1164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graalvmbot merged 1 commit into from
Sep 23, 2026
Merged

[GR-79862] Fix inherited native weak reference offset. #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_indexed_slots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# The Universal Permissive License (UPL), Version 1.0
Expand Down Expand Up @@ -37,7 +37,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

from . import CPyExtTestCase, CPyExtHeapType
from . import CPyExtTestCase, CPyExtHeapType, CPyExtType


class BaseWithSlots:
Expand Down Expand Up @@ -95,6 +95,30 @@ class M3(M1):
x.a, x.b, x.c = 22, 23, 24
self.assertEqual((22, 23, 24), (x.a, x.b, x.c))

def test_weaklistoffset_in_subclass(self):
NativeWeakref = CPyExtType(
'NativeWeakref',
'''
static PyObject* get_native_layout(PyObject* cls) {
PyTypeObject* type = (PyTypeObject*)cls;
return Py_BuildValue("(nn)", type->tp_basicsize, type->tp_weaklistoffset);
}
''',
cmembers='''long value;
PyObject *link;
PyObject *weakrefs;
''',
tp_methods='{"get_native_layout", (PyCFunction)get_native_layout, METH_NOARGS | METH_CLASS, ""}',
ready_code='NativeWeakrefType.tp_weaklistoffset = offsetof(NativeWeakrefObject, weakrefs);',
)

class ManagedSubclass(NativeWeakref):
__slots__ = ('extra',)

self.assertEqual(
(ManagedSubclass.__basicsize__, ManagedSubclass.__weakrefoffset__),
ManagedSubclass.get_native_layout(),
)

def test_slots_in_base_and_subclass(self):
N1 = CPyExtHeapType('Nd1', bases=(BaseWithSlots,), cmembers=cmembers(4))
Expand Down
2 changes: 1 addition & 1 deletion .../src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/ToNativeTypeNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ static void initializeType(PythonManagedClass clazz, long mem, boolean heaptype,
if (clazz instanceof PythonBuiltinClass builtin) {
weaklistoffset = builtin.getType().getWeaklistoffset();
} else {
weaklistoffset = lookupNativeI64MemberInMRO(clazz, PyTypeObject__tp_weaklistoffset, SpecialAttributeNames.T___WEAKLISTOFFSET__);
weaklistoffset = lookupSize(clazz, PyTypeObject__tp_weaklistoffset, HiddenAttr.WEAKLISTOFFSET);
}
long asAsync = slots.has_as_async() ? allocatePyAsyncMethods(slots) : NULLPTR;
long asNumber = slots.has_as_number() ? allocatePyNumberMethods(slots) : NULLPTR;
Expand Down
Loading