Merge commit '8319114feedd2a5b77378bba24eb9fb2689c5033' into object-g…

…etstate2

Objects/typeobject.c

@@ -4968,15 +4968,14 @@ object_getstate_default(PyObject *obj, int required)
     assert(slotnames == Py_None || PyList_Check(slotnames));
     if (required) {
         Py_ssize_t basicsize = PyBaseObject_Type.tp_basicsize;
-        if (Py_TYPE(obj)->tp_dictoffset) {
+        if (Py_TYPE(obj)->tp_dictoffset &&
+            (Py_TYPE(obj)->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0)
+        {
             basicsize += sizeof(PyObject *);
         }
         if (Py_TYPE(obj)->tp_weaklistoffset) {
             basicsize += sizeof(PyObject *);
         }
-        if (Py_TYPE(obj)->tp_inline_values_offset) {
-            basicsize += sizeof(PyDictValues *);
-        }
         if (slotnames != Py_None) {
             basicsize += sizeof(PyObject *) * PyList_GET_SIZE(slotnames);
         }