Kaydet (Commit) 5a1bb4e0 authored tarafından Victor Stinner's avatar Victor Stinner

Initialize base types before child types

object (PyBaseObject_Type) is the base type of type (PyType_Type), int
(PyLong_Type) is the base type of bool (PyBool_Type).
üst 7df3c156
...@@ -1543,6 +1543,9 @@ PyObject _Py_NotImplementedStruct = { ...@@ -1543,6 +1543,9 @@ PyObject _Py_NotImplementedStruct = {
void void
_Py_ReadyTypes(void) _Py_ReadyTypes(void)
{ {
if (PyType_Ready(&PyBaseObject_Type) < 0)
Py_FatalError("Can't initialize object type");
if (PyType_Ready(&PyType_Type) < 0) if (PyType_Ready(&PyType_Type) < 0)
Py_FatalError("Can't initialize type type"); Py_FatalError("Can't initialize type type");
...@@ -1555,6 +1558,9 @@ _Py_ReadyTypes(void) ...@@ -1555,6 +1558,9 @@ _Py_ReadyTypes(void)
if (PyType_Ready(&_PyWeakref_ProxyType) < 0) if (PyType_Ready(&_PyWeakref_ProxyType) < 0)
Py_FatalError("Can't initialize weakref proxy type"); Py_FatalError("Can't initialize weakref proxy type");
if (PyType_Ready(&PyLong_Type) < 0)
Py_FatalError("Can't initialize int type");
if (PyType_Ready(&PyBool_Type) < 0) if (PyType_Ready(&PyBool_Type) < 0)
Py_FatalError("Can't initialize bool type"); Py_FatalError("Can't initialize bool type");
...@@ -1579,9 +1585,6 @@ _Py_ReadyTypes(void) ...@@ -1579,9 +1585,6 @@ _Py_ReadyTypes(void)
if (PyType_Ready(&PySuper_Type) < 0) if (PyType_Ready(&PySuper_Type) < 0)
Py_FatalError("Can't initialize super type"); Py_FatalError("Can't initialize super type");
if (PyType_Ready(&PyBaseObject_Type) < 0)
Py_FatalError("Can't initialize object type");
if (PyType_Ready(&PyRange_Type) < 0) if (PyType_Ready(&PyRange_Type) < 0)
Py_FatalError("Can't initialize range type"); Py_FatalError("Can't initialize range type");
...@@ -1606,9 +1609,6 @@ _Py_ReadyTypes(void) ...@@ -1606,9 +1609,6 @@ _Py_ReadyTypes(void)
if (PyType_Ready(&PyFloat_Type) < 0) if (PyType_Ready(&PyFloat_Type) < 0)
Py_FatalError("Can't initialize float type"); Py_FatalError("Can't initialize float type");
if (PyType_Ready(&PyLong_Type) < 0)
Py_FatalError("Can't initialize int type");
if (PyType_Ready(&PyFrozenSet_Type) < 0) if (PyType_Ready(&PyFrozenSet_Type) < 0)
Py_FatalError("Can't initialize frozenset type"); Py_FatalError("Can't initialize frozenset type");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment