commit c06a6d0958e2eb4449605069b9c10d656ab756e8
author Serhiy Storchaka <storchaka@gmail.com> Sat Dec 19 20:07:48 2015 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Sat Dec 19 20:07:48 2015 +0200
tree 3be097cf344ed6c277ca77bd37f253f5c66d3a7d
parent 6f3d5da36cb6f7a7472c69f92de16682e5a82620

Issue #25421: __sizeof__ methods of builtin types now use dynamic basic size.
This allows sys.getsize() to work correctly with their subclasses with
__slots__ defined.

Modules/_collectionsmodule.c

diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index aaac660..d4cc960 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -1103,7 +1103,7 @@
     Py_ssize_t res;
     Py_ssize_t blocks;
 
-    res = sizeof(dequeobject);
+    res = _PyObject_SIZE(Py_TYPE(deque));
     blocks = (deque->leftindex + deque->len + BLOCKLEN - 1) / BLOCKLEN;
     assert(deque->leftindex + deque->len - 1 ==
            (blocks - 1) * BLOCKLEN + deque->rightindex);

Modules/_io/bufferedio.c

diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index b4632ed..dd518d7 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -391,7 +391,7 @@
 {
     Py_ssize_t res;
 
-    res = sizeof(buffered);
+    res = _PyObject_SIZE(Py_TYPE(self));
     if (self->buffer)
         res += self->buffer_size;
     return PyLong_FromSsize_t(res);

Modules/_io/bytesio.c

diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
index f643e91..82f3851 100644
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -809,7 +809,7 @@
 {
     Py_ssize_t res;
 
-    res = sizeof(bytesio);
+    res = _PyObject_SIZE(Py_TYPE(self));
     if (self->buf)
         res += self->buf_size;
     return PyLong_FromSsize_t(res);

Modules/_struct.c

diff --git a/Modules/_struct.c b/Modules/_struct.c
index bca7a2e..02dd7d3 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -1737,7 +1737,7 @@
 {
     Py_ssize_t size;
 
-    size = sizeof(PyStructObject) + sizeof(formatcode) * (self->s_len + 1);
+    size = _PyObject_SIZE(Py_TYPE(self)) + sizeof(formatcode) * (self->s_len + 1);
     return PyLong_FromSsize_t(size);
 }
 

Modules/arraymodule.c

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 1d1f0d3..f147115 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1541,7 +1541,7 @@
 array_sizeof(arrayobject *self, PyObject *unused)
 {
     Py_ssize_t res;
-    res = sizeof(arrayobject) + self->allocated * self->ob_descr->itemsize;
+    res = _PyObject_SIZE(Py_TYPE(self)) + self->allocated * self->ob_descr->itemsize;
     return PyLong_FromSsize_t(res);
 }
 

Modules/mmapmodule.c

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index 8fdf7f7..1ebccdf 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -655,7 +655,7 @@
 {
     Py_ssize_t res;
 
-    res = sizeof(mmap_object);
+    res = _PyObject_SIZE(Py_TYPE(self));
     if (self->tagname)
         res += strlen(self->tagname) + 1;
     return PyLong_FromSsize_t(res);

Modules/parsermodule.c

diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index eb2d600..2434c67 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -720,7 +720,7 @@
 {
     Py_ssize_t res;
 
-    res = sizeof(PyST_Object) + _PyNode_SizeOf(st->st_node);
+    res = _PyObject_SIZE(Py_TYPE(st)) + _PyNode_SizeOf(st->st_node);
     return PyLong_FromSsize_t(res);
 }