Walkthrough

These changes refine the Python type system's memory layout calculations and dict-handling logic. A new constant SIZEOF_PYOBJECT_HEAD is introduced to represent the base object header size, which is then used to correctly compute __basicsize__ for types. The type creation logic propagates itemsize from base types and adds conditional may_add_dict gating for dict-related flags. A new shape_differs helper function improves layout comparison between types.

Changes

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

Possibly related PRs

• RustPython/RustPython#6544: Directly modifies itemsize/type-slot machinery and type layout propagation logic.
• RustPython/RustPython#6010: Modifies dict descriptor and dict-related flag handling during type creation.
• RustPython/RustPython#6392: Modifies rules for HAS_DICT/MANAGED_DICT addition and heap-type dict handling.

Suggested reviewers

• arihant2math

Poem

🐰 A rabbit hops through types with care,
Measuring headers here and there,
Layout diffs in shapes take flight,
Dict gates close, then open right—
Size by size, the code grows bright! ✨

Pre-merge checks and finishing touches

• 📝 Generate docstrings

• Create PR with unit tests
• Post copyable unit tests in a comment

Configuration used: Path: .coderabbit.yml

Review profile: CHILL

Plan: Pro

Reviewing files that changed from the base of the PR and between ee74713 and 63c3ba3.

• Lib/test/test_types.py is excluded by !Lib/**

• crates/derive-impl/src/pyclass.rs
• crates/vm/src/builtins/type.rs
• crates/vm/src/object/core.rs
• crates/vm/src/object/mod.rs

📄 CodeRabbit inference engine (.github/copilot-instructions.md)

**/*.rs: Follow the default rustfmt code style by running cargo fmt to format Rust code
Always run clippy to lint code (cargo clippy) before completing tasks and fix any warnings or lints introduced by changes
Follow Rust best practices for error handling and memory management
Use the macro system (pyclass, pymodule, pyfunction, etc.) when implementing Python functionality in Rust

Files:

• crates/vm/src/object/mod.rs
• crates/derive-impl/src/pyclass.rs
• crates/vm/src/object/core.rs
• crates/vm/src/builtins/type.rs

crates/derive-impl/src/pyclass.rs (1)

456-463: LGTM! Documentation clarifies basicsize computation.

The updated comment accurately reflects that when repr(transparent) with a base is not present, basicsize stores only the payload size, and the SIZEOF_PYOBJECT_HEAD is added separately in the __basicsize__ getter. This aligns with the implementation changes in crates/vm/src/builtins/type.rs.

crates/vm/src/object/mod.rs (1)

10-10: LGTM! Appropriate crate-internal re-export.

The pub(crate) visibility correctly limits access to within the VM crate while making SIZEOF_PYOBJECT_HEAD available for internal basicsize calculations.

crates/vm/src/object/core.rs (1)

117-117: LGTM! Clean calculation of object header size.

Using std::mem::size_of::<PyInner<()>>() is an elegant way to compute the PyObject header size by measuring the struct with a zero-sized type payload. The pub(crate) visibility is appropriate for internal use in basicsize calculations.

crates/vm/src/builtins/type.rs (5)

1341-1352: LGTM! Correct gating logic for dict addition.

The may_add_dict guard properly prevents adding a dict when the primary base class already has one (checking !base.slots.flags.has_feature(PyTypeFlags::HAS_DICT)). The updated condition on line 1350 correctly combines:

1. No __slots__ defined AND base doesn't have dict (automatic dict), OR
2. __dict__ explicitly in __slots__

This matches CPython's behavior of checking tp_dictoffset == 0 on the base.

---

1354-1360: LGTM! Proper itemsize inheritance from base type.

Line 1358 correctly propagates itemsize from the base type during heap type creation. This is essential for correctly handling subclasses of variable-length types (e.g., tuple, list, bytes) where itemsize determines the per-element size.

---

2019-2022: LGTM! Clean helper for layout comparison.

The shape_differs function encapsulates layout comparison logic, checking both __basicsize__() (instance size) and itemsize (per-element size for variable-length types). This improves code readability and maintainability.

---

2024-2032: LGTM! Refactored to use shape_differs helper.

Line 2031 now uses the shape_differs helper for clearer intent. The logic remains equivalent: if the derived type has a different layout than its base, it becomes the solid base; otherwise, continue up the chain.

---

785-787: Remove unnecessary concern about const removal—the change is correct and has no breaking callers.

The removal of const from __basicsize__ is correct. The only usage in the codebase (line 2021 in shape_differs) is a normal runtime call. The #[pygetset] decorator indicates this is a Python property getter, which cannot be const. No existing code depends on this being a const fn.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

• X
• Mastodon
• Reddit
• LinkedIn

Comment @coderabbitai help to get the list of available commands and usage tips.