@@ -323,6 +323,14 @@ pub unsafe extern "C" fn PyObject_GetTypeData(
     }
 }
 
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn PyObject_GetTypeData_DuringGC(
+    obj: *mut PyObject,
+    cls: *mut PyTypeObject,
+) -> *mut c_void {
+    unsafe { PyObject_GetTypeData(obj, cls) }
+}
+
 #[unsafe(no_mangle)]
 pub extern "C" fn PyType_Freeze(_ty: *mut PyTypeObject) -> c_int {
     0
@@ -332,7 +340,7 @@ pub extern "C" fn PyType_Freeze(_ty: *mut PyTypeObject) -> c_int {
 mod tests {
     use pyo3::IntoPyObjectExt;
     use pyo3::prelude::*;
-    use pyo3::types::{PyDict, PyInt, PyString, PyType, PyTypeMethods};
+    use pyo3::types::{PyDict, PyInt, PyList, PyString, PyType, PyTypeMethods};
 
     #[test]
     fn type_name() {
@@ -485,4 +493,37 @@ mod tests {
             );
         });
     }
+
+    #[test]
+    fn subclass_with_property() {
+        #[pyclass(frozen, extends=PyList)]
+        struct MyList {}
+
+        #[pymethods]
+        impl MyList {
+            #[new]
+            fn new() -> Self {
+                Self {}
+            }
+
+            #[getter]
+            fn name(&self) -> &'static str {
+                "Some list"
+            }
+        }
+
+        Python::attach(|py| {
+            let obj = Bound::new(py, MyList {}).unwrap();
+
+            assert!(obj.is_instance_of::<PyList>());
+
+            assert_eq!(
+                obj.getattr("name")
+                    .unwrap()
+                    .cast_into::<PyString>()
+                    .unwrap(),
+                "Some list"
+            );
+        });
+    }
 }