Rename function and move to internal header.

markshannon · markshannon · commit 8c894f328f85 · 2021-10-12T15:16:11.000+01:00
diff --git a/Include/cpython/object.h b/Include/cpython/object.h
@@ -334,7 +334,6 @@ PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *);
 PyAPI_FUNC(PyObject *) _PyObject_NextNotImplemented(PyObject *);
 PyAPI_FUNC(void) PyObject_CallFinalizer(PyObject *);
 PyAPI_FUNC(int) PyObject_CallFinalizerFromDealloc(PyObject *);
-int _PyObject_DictEmpty(PyObject *);
 
 /* Same as PyObject_Generic{Get,Set}Attr, but passing the attributes
    dict as the last parameter. */
diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
@@ -190,6 +190,7 @@ PyObject ** _PyObject_DictPointer(PyObject *);
 int _PyObject_VisitInstanceAttributes(PyObject *self, visitproc visit, void *arg);
 void _PyObject_ClearInstanceAttributes(PyObject *self);
 void _PyObject_FreeInstanceAttributes(PyObject *self);
+int _PyObject_IsInstanceDictEmpty(PyObject *);
 
 #ifdef __cplusplus
 }
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -5051,7 +5051,7 @@ _PyObject_GetInstanceAttribute(PyObject *obj, PyDictValues *values,
 }
 
 int
-_PyObject_DictEmpty(PyObject *obj)
+_PyObject_IsInstanceDictEmpty(PyObject *obj)
 {
     PyTypeObject *tp = Py_TYPE(obj);
     if (tp->tp_dictoffset == 0) {
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -4941,7 +4941,7 @@ _PyObject_GetState(PyObject *obj, int required)
                          Py_TYPE(obj)->tp_name);
             return NULL;
         }
-        if (_PyObject_DictEmpty(obj)) {
+        if (_PyObject_IsInstanceDictEmpty(obj)) {
             state = Py_None;
             Py_INCREF(state);
         }

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,7 @@ PyObject ** _PyObject_DictPointer(PyObject *);`
`190`	`190`	`int _PyObject_VisitInstanceAttributes(PyObject self, visitproc visit, void arg);`
`191`	`191`	`void _PyObject_ClearInstanceAttributes(PyObject *self);`
`192`	`192`	`void _PyObject_FreeInstanceAttributes(PyObject *self);`
	`193`	`+int _PyObject_IsInstanceDictEmpty(PyObject *);`
`193`	`194`
`194`	`195`	`#ifdef __cplusplus`
`195`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5051,7 +5051,7 @@ _PyObject_GetInstanceAttribute(PyObject obj, PyDictValues values,`
`5051`	`5051`	`}`
`5052`	`5052`
`5053`	`5053`	`int`
`5054`		`-_PyObject_DictEmpty(PyObject *obj)`
	`5054`	`+_PyObject_IsInstanceDictEmpty(PyObject *obj)`
`5055`	`5055`	`{`
`5056`	`5056`	`PyTypeObject *tp = Py_TYPE(obj);`
`5057`	`5057`	`if (tp->tp_dictoffset == 0) {`
Original file line number	Diff line number	Diff line change
`@@ -4941,7 +4941,7 @@ _PyObject_GetState(PyObject *obj, int required)`
`4941`	`4941`	`Py_TYPE(obj)->tp_name);`
`4942`	`4942`	`return NULL;`
`4943`	`4943`	`}`
`4944`		`- if (_PyObject_DictEmpty(obj)) {`
	`4944`	`+ if (_PyObject_IsInstanceDictEmpty(obj)) {`
`4945`	`4945`	`state = Py_None;`
`4946`	`4946`	`Py_INCREF(state);`
`4947`	`4947`	`}`