Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 88063 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88063 | benjamin.peterson | 2011-01-17 13:24:34 -0600 (Mon, 17 Jan 2011) | 4 lines

  turn some checks into assertions, since they are implied by the caller

  Reviewed by Georg.
........
This commit is contained in:
Benjamin Peterson 2011-01-17 19:30:29 +00:00
parent 97b68126f2
commit cf94b8b4da
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Objects/typeobject.c
View File

@ -3011,10 +3011,8 @@ same_slots_added(PyTypeObject *a, PyTypeObject *b)
Py_ssize_t size; Py_ssize_t size;
PyObject *slots_a, *slots_b; PyObject *slots_a, *slots_b;
if (base != b->tp_base) assert(base == b->tp_base);
return 0; assert(equiv_structs(a, base) && equiv_structs(b, base));
if (equiv_structs(a, base) && equiv_structs(b, base))
return 1;
size = base->tp_basicsize; size = base->tp_basicsize;
if (a->tp_dictoffset == size && b->tp_dictoffset == size) if (a->tp_dictoffset == size && b->tp_dictoffset == size)
size += sizeof(PyObject *); size += sizeof(PyObject *);