[3.6] bpo-12414: Update code_sizeof() to take in account co_extra memory. (#1168) (#1198)
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index df9ebd4..e151f49 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -913,13 +913,15 @@
return inner
check(get_cell().__closure__[0], size('P'))
# code
- check(get_cell().__code__, size('6i13P'))
- check(get_cell.__code__, size('6i13P'))
+ def check_code_size(a, expected_size):
+ self.assertGreaterEqual(sys.getsizeof(a), expected_size)
+ check_code_size(get_cell().__code__, size('6i13P'))
+ check_code_size(get_cell.__code__, size('6i13P'))
def get_cell2(x):
def inner():
return x
return inner
- check(get_cell2.__code__, size('6i13P') + 1)
+ check_code_size(get_cell2.__code__, size('6i13P') + calcsize('n'))
# complex
check(complex(0,1), size('2d'))
# method_descriptor (descriptor object)
diff --git a/Misc/ACKS b/Misc/ACKS
index 72070e1..ac2c4ed 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1060,6 +1060,7 @@
Matti Mäki
Jörg Müller
Kaushik N
+Dong-hee Na
Dale Nagata
John Nagle
Takahiro Nakayama
diff --git a/Misc/NEWS b/Misc/NEWS
index cb9fab6..b1f79d6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@
Core and Builtins
-----------------
+- bpo-12414: sys.getsizeof() on a code object now returns the sizes
+ which includes the code struct and sizes of objects which it references.
+ Patch by Dong-hee Na.
+
- bpo-29949: Fix memory usage regression of set and frozenset object.
- bpo-29935: Fixed error messages in the index() method of tuple, list and deque
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index df8b953..22c4f85 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -446,11 +446,15 @@
static PyObject *
code_sizeof(PyCodeObject *co, void *unused)
{
- Py_ssize_t res;
+ Py_ssize_t res = _PyObject_SIZE(Py_TYPE(co));
+ _PyCodeObjectExtra *co_extra = (_PyCodeObjectExtra*) co->co_extra;
- res = _PyObject_SIZE(Py_TYPE(co));
if (co->co_cell2arg != NULL && co->co_cellvars != NULL)
- res += PyTuple_GET_SIZE(co->co_cellvars) * sizeof(unsigned char);
+ res += PyTuple_GET_SIZE(co->co_cellvars) * sizeof(Py_ssize_t);
+
+ if (co_extra != NULL)
+ res += co_extra->ce_size * sizeof(co_extra->ce_extras[0]);
+
return PyLong_FromSsize_t(res);
}