bpo-12414: Update code_sizeof() to take in account co_extra memory.

Author: corona10

Lib/test/test_sys.py

@@ -922,13 +922,15 @@ def inner():
  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') + calcsize('n'))
+ check_code_size(get_cell2.__code__, size('6i13P') + calcsize('n'))
  # complex
  check(complex(0,1), size('2d'))
  # method_descriptor (descriptor object)

Misc/ACKS

@@ -1063,6 +1063,7 @@ R. David Murray
 Matti Mäki
 Jörg Müller
 Kaushik N
+Dong-hee Na
 Dale Nagata
 John Nagle
 Takahiro Nakayama

Misc/NEWS

@@ -10,6 +10,10 @@ What's New in Python 3.7.0 alpha 1?
 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-29839: len() now raises ValueError rather than OverflowError if
  __len__() returned a large negative integer.
 

Objects/codeobject.c

@@ -451,11 +451,15 @@ code_dealloc(PyCodeObject *co)
 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(Py_ssize_t);
+
+ if (co_extra != NULL)
+ res += co_extra->ce_size * sizeof(co_extra->ce_extras[0]);
+
  return PyLong_FromSsize_t(res);
 }