1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try to fix crash on x86 OpenIndiana buildbot.

Browse Source
This commit is contained in:
Antoine Pitrou 2012-06-24 00:42:59 +02:00
parent 1351ca6e66
commit 66a3a7ed10
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Objects/typeobject.c
View File

@ -2396,6 +2396,8 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
if (res == NULL) if (res == NULL)
return NULL; return NULL;
type = &res->ht_type; type = &res->ht_type;
/* The flags must be initialized early, before the GC traverses us */
type->tp_flags = spec->flags | Py_TPFLAGS_HEAPTYPE;
res->ht_name = PyUnicode_FromString(s); res->ht_name = PyUnicode_FromString(s);
if (!res->ht_name) if (!res->ht_name)
goto fail; goto fail;
@ -2450,7 +2452,6 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
type->tp_basicsize = spec->basicsize; type->tp_basicsize = spec->basicsize;
type->tp_itemsize = spec->itemsize; type->tp_itemsize = spec->itemsize;
type->tp_flags = spec->flags | Py_TPFLAGS_HEAPTYPE;
for (slot = spec->slots; slot->slot; slot++) { for (slot = spec->slots; slot->slot; slot++) {
if (slot->slot >= Py_ARRAY_LENGTH(slotoffsets)) { if (slot->slot >= Py_ARRAY_LENGTH(slotoffsets)) {