Skip to content

GH-115776: Rename Py_TPFLAGS_INLINE_VALUES as _Py_TPFLAGS_INLINE_VALUES#128635

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

Closed
markshannon wants to merge 2 commits into from
Closed

GH-115776: Rename Py_TPFLAGS_INLINE_VALUES as _Py_TPFLAGS_INLINE_VALUES#128635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f475d9d
Rename Py_TPFLAGS_INLINE_VALUES as _Py_TPFLAGS_INLINE_VALUES as it sh…
markshannon Jan 8, 2025
ddfc102
Add news
markshannon Jan 8, 2025
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
2 changes: 1 addition & 1 deletion Include/internal/pycore_object.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -944,7 +944,7 @@ _PyObject_InlineValues(PyObject *obj)
{
PyTypeObject *tp = Py_TYPE(obj);
assert(tp->tp_basicsize > 0 && (size_t)tp->tp_basicsize % sizeof(PyObject *) == 0);
assert(Py_TYPE(obj)->tp_flags & Py_TPFLAGS_INLINE_VALUES);
assert(Py_TYPE(obj)->tp_flags & _Py_TPFLAGS_INLINE_VALUES);
assert(Py_TYPE(obj)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
return (PyDictValues *)((char *)obj + tp->tp_basicsize);
}
Expand Down
2 changes: 1 addition & 1 deletion Include/object.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -513,7 +513,7 @@ given type object has a specified feature.
/* The values array is placed inline directly after the rest of
* the object. Implies Py_TPFLAGS_HAVE_GC.
*/
#define Py_TPFLAGS_INLINE_VALUES (1 << 2)
#define _Py_TPFLAGS_INLINE_VALUES (1 << 2)

/* Placement of weakref pointers are managed by the VM, not by the type.
* The VM will automatically set tp_weaklistoffset.
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2025-01-08-15-56-36.gh-issue-128635.ODIPtl.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
The ``Py_TPFLAGS_INLINE_VALUES`` has been renamed
``_Py_TPFLAGS_INLINE_VALUES`` to clarify that it is internal and should not
be used.
4 changes: 2 additions & 2 deletions Modules/_testinternalcapi.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1322,7 +1322,7 @@ static PyObject *
get_object_dict_values(PyObject *self, PyObject *obj)
{
PyTypeObject *type = Py_TYPE(obj);
if (!_PyType_HasFeature(type, Py_TPFLAGS_INLINE_VALUES)){
if (!_PyType_HasFeature(type, _Py_TPFLAGS_INLINE_VALUES)){
Py_RETURN_NONE;
}
PyDictValues *values = _PyObject_InlineValues(obj);
Expand DownExpand Up@@ -1982,7 +1982,7 @@ get_tlbc_id(PyObject *Py_UNUSED(module), PyObject *obj)
static PyObject *
has_inline_values(PyObject *self, PyObject *obj)
{
if ((Py_TYPE(obj)->tp_flags & Py_TPFLAGS_INLINE_VALUES) &&
if ((Py_TYPE(obj)->tp_flags & _Py_TPFLAGS_INLINE_VALUES) &&
_PyObject_InlineValues(obj)->valid){
Py_RETURN_TRUE;
}
Expand Down
18 changes: 9 additions & 9 deletions Objects/dictobject.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6677,7 +6677,7 @@ void
_PyObject_InitInlineValues(PyObject *obj, PyTypeObject *tp)
{
assert(tp->tp_flags & Py_TPFLAGS_HEAPTYPE);
assert(tp->tp_flags & Py_TPFLAGS_INLINE_VALUES);
assert(tp->tp_flags & _Py_TPFLAGS_INLINE_VALUES);
assert(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT);
PyDictKeysObject *keys = CACHED_KEYS(tp);
assert(keys != NULL);
Expand DownExpand Up@@ -6798,7 +6798,7 @@ store_instance_attr_lock_held(PyObject *obj, PyDictValues *values,
PyDictKeysObject *keys = CACHED_KEYS(Py_TYPE(obj));
assert(keys != NULL);
assert(values != NULL);
assert(Py_TYPE(obj)->tp_flags & Py_TPFLAGS_INLINE_VALUES);
assert(Py_TYPE(obj)->tp_flags & _Py_TPFLAGS_INLINE_VALUES);
Py_ssize_t ix = DKIX_EMPTY;
PyDictObject *dict = _PyObject_GetManagedDict(obj);
assert(dict == NULL || ((PyDictObject *)dict)->ma_values == values);
Expand DownExpand Up@@ -7069,7 +7069,7 @@ _PyObject_IsInstanceDictEmpty(PyObject *obj)
return 1;
}
PyDictObject *dict;
if (tp->tp_flags & Py_TPFLAGS_INLINE_VALUES){
if (tp->tp_flags & _Py_TPFLAGS_INLINE_VALUES){
PyDictValues *values = _PyObject_InlineValues(obj);
if (FT_ATOMIC_LOAD_UINT8(values->valid)){
PyDictKeysObject *keys = CACHED_KEYS(tp);
Expand DownExpand Up@@ -7102,7 +7102,7 @@ PyObject_VisitManagedDict(PyObject *obj, visitproc visit, void *arg)
if((tp->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0){
return 0;
}
if (tp->tp_flags & Py_TPFLAGS_INLINE_VALUES){
if (tp->tp_flags & _Py_TPFLAGS_INLINE_VALUES){
PyDictValues *values = _PyObject_InlineValues(obj);
if (values->valid){
for (Py_ssize_t i = 0; i < values->capacity; i++){
Expand DownExpand Up@@ -7219,7 +7219,7 @@ set_or_clear_managed_dict(PyObject *obj, PyObject *new_dict, bool clear)
#endif
int err = 0;
PyTypeObject *tp = Py_TYPE(obj);
if (tp->tp_flags & Py_TPFLAGS_INLINE_VALUES){
if (tp->tp_flags & _Py_TPFLAGS_INLINE_VALUES){
#ifdef Py_GIL_DISABLED
PyDictObject *prev_dict;
if (!try_set_dict_inline_only_or_other_dict(obj, new_dict, &prev_dict)){
Expand DownExpand Up@@ -7335,7 +7335,7 @@ _PyDict_DetachFromObject(PyDictObject *mp, PyObject *obj)
ASSERT_WORLD_STOPPED_OR_OBJ_LOCKED(mp);
assert(mp->ma_values->embedded == 1);
assert(mp->ma_values->valid == 1);
assert(Py_TYPE(obj)->tp_flags & Py_TPFLAGS_INLINE_VALUES);
assert(Py_TYPE(obj)->tp_flags & _Py_TPFLAGS_INLINE_VALUES);

PyDictValues *values = copy_values(mp->ma_values);

Expand All@@ -7358,7 +7358,7 @@ ensure_managed_dict(PyObject *obj)
PyDictObject *dict = _PyObject_GetManagedDict(obj);
if (dict == NULL){
PyTypeObject *tp = Py_TYPE(obj);
if ((tp->tp_flags & Py_TPFLAGS_INLINE_VALUES) &&
if ((tp->tp_flags & _Py_TPFLAGS_INLINE_VALUES) &&
FT_ATOMIC_LOAD_UINT8(_PyObject_InlineValues(obj)->valid)){
dict = _PyObject_MaterializeManagedDict(obj);
}
Expand DownExpand Up@@ -7402,7 +7402,7 @@ ensure_nonmanaged_dict(PyObject *obj, PyObject **dictptr)
PyTypeObject *tp = Py_TYPE(obj);
if (_PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE) && (cached = CACHED_KEYS(tp))){
PyInterpreterState *interp = _PyInterpreterState_GET();
assert(!_PyType_HasFeature(tp, Py_TPFLAGS_INLINE_VALUES));
assert(!_PyType_HasFeature(tp, _Py_TPFLAGS_INLINE_VALUES));
dict = new_dict_with_shared_keys(interp, cached);
}
else{
Expand DownExpand Up@@ -7624,7 +7624,7 @@ _PyDict_SendEvent(int watcher_bits,
static int
_PyObject_InlineValuesConsistencyCheck(PyObject *obj)
{
if ((Py_TYPE(obj)->tp_flags & Py_TPFLAGS_INLINE_VALUES) == 0){
if ((Py_TYPE(obj)->tp_flags & _Py_TPFLAGS_INLINE_VALUES) == 0){
return 1;
}
assert(Py_TYPE(obj)->tp_flags & Py_TPFLAGS_MANAGED_DICT);
Expand Down
10 changes: 5 additions & 5 deletions Objects/object.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1518,7 +1518,7 @@ _PyObject_GetDictPtr(PyObject *obj)
return _PyObject_ComputedDictPointer(obj);
}
PyDictObject *dict = _PyObject_GetManagedDict(obj);
if (dict == NULL && Py_TYPE(obj)->tp_flags & Py_TPFLAGS_INLINE_VALUES){
if (dict == NULL && Py_TYPE(obj)->tp_flags & _Py_TPFLAGS_INLINE_VALUES){
dict = _PyObject_MaterializeManagedDict(obj);
if (dict == NULL){
PyErr_Clear();
Expand DownExpand Up@@ -1594,7 +1594,7 @@ _PyObject_GetMethod(PyObject *obj, PyObject *name, PyObject **method)
}
}
PyObject *dict, *attr;
if ((tp->tp_flags & Py_TPFLAGS_INLINE_VALUES) &&
if ((tp->tp_flags & _Py_TPFLAGS_INLINE_VALUES) &&
_PyObject_TryGetInstanceAttribute(obj, name, &attr)){
if (attr != NULL){
*method = attr;
Expand DownExpand Up@@ -1696,7 +1696,7 @@ _PyObject_GenericGetAttrWithDict(PyObject *obj, PyObject *name,
}
}
if (dict == NULL){
if ((tp->tp_flags & Py_TPFLAGS_INLINE_VALUES)){
if ((tp->tp_flags & _Py_TPFLAGS_INLINE_VALUES)){
if (PyUnicode_CheckExact(name) &&
_PyObject_TryGetInstanceAttribute(obj, name, &res)){
if (res != NULL){
Expand DownExpand Up@@ -1812,7 +1812,7 @@ _PyObject_GenericSetAttrWithDict(PyObject *obj, PyObject *name,
if (dict == NULL){
PyObject **dictptr;

if ((tp->tp_flags & Py_TPFLAGS_INLINE_VALUES)){
if ((tp->tp_flags & _Py_TPFLAGS_INLINE_VALUES)){
res = _PyObject_StoreInstanceAttribute(obj, name, value);
goto error_check;
}
Expand DownExpand Up@@ -1883,7 +1883,7 @@ PyObject_GenericSetDict(PyObject *obj, PyObject *value, void *context)
{
PyObject **dictptr = _PyObject_GetDictPtr(obj);
if (dictptr == NULL){
if (_PyType_HasFeature(Py_TYPE(obj), Py_TPFLAGS_INLINE_VALUES) &&
if (_PyType_HasFeature(Py_TYPE(obj), _Py_TPFLAGS_INLINE_VALUES) &&
_PyObject_GetManagedDict(obj) == NULL
){
/* Was unable to convert to dict */
Expand Down
20 changes: 10 additions & 10 deletions Objects/typeobject.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2197,7 +2197,7 @@ type_call(PyObject *self, PyObject *args, PyObject *kwds)
PyObject *
_PyType_NewManagedObject(PyTypeObject *type)
{
assert(type->tp_flags & Py_TPFLAGS_INLINE_VALUES);
assert(type->tp_flags & _Py_TPFLAGS_INLINE_VALUES);
assert(_PyType_IS_GC(type));
assert(type->tp_new == PyBaseObject_Type.tp_new);
assert(type->tp_alloc == PyType_GenericAlloc);
Expand All@@ -2222,7 +2222,7 @@ _PyType_AllocNoTrack(PyTypeObject *type, Py_ssize_t nitems)
size_t size = _PyObject_VAR_SIZE(type, nitems+1);

const size_t presize = _PyType_PreHeaderSize(type);
if (type->tp_flags & Py_TPFLAGS_INLINE_VALUES){
if (type->tp_flags & _Py_TPFLAGS_INLINE_VALUES){
assert(type->tp_itemsize == 0);
size += _PyInlineValuesSize(type);
}
Expand All@@ -2246,7 +2246,7 @@ _PyType_AllocNoTrack(PyTypeObject *type, Py_ssize_t nitems)
else{
_PyObject_InitVar((PyVarObject *)obj, type, nitems);
}
if (type->tp_flags & Py_TPFLAGS_INLINE_VALUES){
if (type->tp_flags & _Py_TPFLAGS_INLINE_VALUES){
_PyObject_InitInlineValues(obj, type);
}
return obj;
Expand DownExpand Up@@ -2399,8 +2399,8 @@ subtype_clear(PyObject *self)
PyObject_ClearManagedDict(self);
}
else{
assert((base->tp_flags & Py_TPFLAGS_INLINE_VALUES) ==
(type->tp_flags & Py_TPFLAGS_INLINE_VALUES));
assert((base->tp_flags & _Py_TPFLAGS_INLINE_VALUES) ==
(type->tp_flags & _Py_TPFLAGS_INLINE_VALUES));
}
}
else if (type->tp_dictoffset != base->tp_dictoffset){
Expand DownExpand Up@@ -5953,7 +5953,7 @@ type_setattro(PyObject *self, PyObject *name, PyObject *value)
}

PyTypeObject *metatype = Py_TYPE(type);
assert(!_PyType_HasFeature(metatype, Py_TPFLAGS_INLINE_VALUES));
assert(!_PyType_HasFeature(metatype, _Py_TPFLAGS_INLINE_VALUES));
assert(!_PyType_HasFeature(metatype, Py_TPFLAGS_MANAGED_DICT));

PyObject *old_value = NULL;
Expand DownExpand Up@@ -6769,8 +6769,8 @@ compatible_for_assignment(PyTypeObject* oldto, PyTypeObject* newto, const char*
!same_slots_added(newbase, oldbase))){
goto differs;
}
if ((oldto->tp_flags & Py_TPFLAGS_INLINE_VALUES) !=
((newto->tp_flags & Py_TPFLAGS_INLINE_VALUES)))
if ((oldto->tp_flags & _Py_TPFLAGS_INLINE_VALUES) !=
((newto->tp_flags & _Py_TPFLAGS_INLINE_VALUES)))
{
goto differs;
}
Expand DownExpand Up@@ -6859,7 +6859,7 @@ object_set_class_world_stopped(PyObject *self, PyTypeObject *newto)
if (compatible_for_assignment(oldto, newto, "__class__")){
/* Changing the class will change the implicit dict keys,
* so we must materialize the dictionary first. */
if (oldto->tp_flags & Py_TPFLAGS_INLINE_VALUES){
if (oldto->tp_flags & _Py_TPFLAGS_INLINE_VALUES){
PyDictObject *dict = _PyObject_GetManagedDict(self);
if (dict == NULL){
dict = _PyObject_MaterializeManagedDict_LockHeld(self);
Expand DownExpand Up@@ -8543,7 +8543,7 @@ type_ready_managed_dict(PyTypeObject *type)
}
}
if (type->tp_itemsize == 0){
type->tp_flags |= Py_TPFLAGS_INLINE_VALUES;
type->tp_flags |= _Py_TPFLAGS_INLINE_VALUES;
}
return 0;
}
Expand Down
6 changes: 3 additions & 3 deletions Python/bytecodes.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2162,7 +2162,7 @@ dummy_func(
op(_CHECK_MANAGED_OBJECT_HAS_VALUES, (owner -- owner)){
PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner);
assert(Py_TYPE(owner_o)->tp_dictoffset < 0);
assert(Py_TYPE(owner_o)->tp_flags & Py_TPFLAGS_INLINE_VALUES);
assert(Py_TYPE(owner_o)->tp_flags & _Py_TPFLAGS_INLINE_VALUES);
DEOPT_IF(!_PyObject_InlineValues(owner_o)->valid);
}

Expand DownExpand Up@@ -2362,7 +2362,7 @@ dummy_func(
PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner);

assert(Py_TYPE(owner_o)->tp_dictoffset < 0);
assert(Py_TYPE(owner_o)->tp_flags & Py_TPFLAGS_INLINE_VALUES);
assert(Py_TYPE(owner_o)->tp_flags & _Py_TPFLAGS_INLINE_VALUES);
if (_PyObject_GetManagedDict(owner_o) ||
!FT_ATOMIC_LOAD_UINT8(_PyObject_InlineValues(owner_o)->valid)){
UNLOCK_OBJECT(owner_o);
Expand DownExpand Up@@ -3254,7 +3254,7 @@ dummy_func(

op(_GUARD_DORV_VALUES_INST_ATTR_FROM_DICT, (owner -- owner)){
PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner);
assert(Py_TYPE(owner_o)->tp_flags & Py_TPFLAGS_INLINE_VALUES);
assert(Py_TYPE(owner_o)->tp_flags & _Py_TPFLAGS_INLINE_VALUES);
DEOPT_IF(!_PyObject_InlineValues(owner_o)->valid);
}

Expand Down
6 changes: 3 additions & 3 deletions Python/executor_cases.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Python/gc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2269,15 +2269,15 @@ _PyObject_GC_New(PyTypeObject *tp)
{
size_t presize = _PyType_PreHeaderSize(tp);
size_t size = _PyObject_SIZE(tp);
if (_PyType_HasFeature(tp, Py_TPFLAGS_INLINE_VALUES)){
if (_PyType_HasFeature(tp, _Py_TPFLAGS_INLINE_VALUES)){
size += _PyInlineValuesSize(tp);
}
PyObject *op = gc_alloc(tp, size, presize);
if (op == NULL){
return NULL;
}
_PyObject_Init(op, tp);
if (tp->tp_flags & Py_TPFLAGS_INLINE_VALUES){
if (tp->tp_flags & _Py_TPFLAGS_INLINE_VALUES){
_PyObject_InitInlineValues(op, tp);
}
return op;
Expand Down
4 changes: 2 additions & 2 deletions Python/gc_free_threading.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1839,15 +1839,15 @@ _PyObject_GC_New(PyTypeObject *tp)
{
size_t presize = _PyType_PreHeaderSize(tp);
size_t size = _PyObject_SIZE(tp);
if (_PyType_HasFeature(tp, Py_TPFLAGS_INLINE_VALUES)){
if (_PyType_HasFeature(tp, _Py_TPFLAGS_INLINE_VALUES)){
size += _PyInlineValuesSize(tp);
}
PyObject *op = gc_alloc(tp, size, presize);
if (op == NULL){
return NULL;
}
_PyObject_Init(op, tp);
if (tp->tp_flags & Py_TPFLAGS_INLINE_VALUES){
if (tp->tp_flags & _Py_TPFLAGS_INLINE_VALUES){
_PyObject_InitInlineValues(op, tp);
}
return op;
Expand Down
8 changes: 4 additions & 4 deletions Python/generated_cases.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Python/specialize.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1027,7 +1027,7 @@ specialize_dict_access(
SPECIALIZATION_FAIL(base_op, SPEC_FAIL_ATTR_NOT_MANAGED_DICT);
return 0;
}
if (type->tp_flags & Py_TPFLAGS_INLINE_VALUES &&
if (type->tp_flags & _Py_TPFLAGS_INLINE_VALUES &&
FT_ATOMIC_LOAD_UINT8(_PyObject_InlineValues(owner)->valid) &&
!(base_op == STORE_ATTR && _PyObject_GetManagedDict(owner) != NULL))
{
Expand DownExpand Up@@ -1080,7 +1080,7 @@ instance_has_key(PyObject *obj, PyObject* name)
if ((cls->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0){
return false;
}
if (cls->tp_flags & Py_TPFLAGS_INLINE_VALUES){
if (cls->tp_flags & _Py_TPFLAGS_INLINE_VALUES){
PyDictKeysObject *keys = ((PyHeapTypeObject *)cls)->ht_cached_keys;
Py_ssize_t index = _PyDictKeys_StringLookup(keys, name);
return index >= 0;
Expand DownExpand Up@@ -1525,7 +1525,7 @@ PyObject *descr, DescriptorClassification kind, bool is_method)

assert(descr != NULL);
assert((is_method && kind == METHOD) || (!is_method && kind == NON_DESCRIPTOR));
if (owner_cls->tp_flags & Py_TPFLAGS_INLINE_VALUES){
if (owner_cls->tp_flags & _Py_TPFLAGS_INLINE_VALUES){
PyDictKeysObject *keys = ((PyHeapTypeObject *)owner_cls)->ht_cached_keys;
assert(_PyDictKeys_StringLookup(keys, name) < 0);
uint32_t keys_version = _PyDictKeys_GetVersionForCurrentState(
Expand Down
Loading
Loading