Skip to content

C
cython
Commit 8e02ca09 authored by Stefan Behnel's avatar Stefan Behnel
Browse files
Options

Revert "Add tp_inline_values_offset to slot_table (GH-4472)" 

This reverts commit 751532a5.
parent 9bac8a99
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 63 deletions
Cython/Compiler/TypeSlots.py
View file @ 8e02ca09
...@@ -1064,7 +1064,6 @@ class SlotTable(object): ...@@ -1064,7 +1064,6 @@ class SlotTable(object):
EmptySlot("tp_finalize", ifdef="PY_VERSION_HEX >= 0x030400a1"), EmptySlot("tp_finalize", ifdef="PY_VERSION_HEX >= 0x030400a1"),
EmptySlot("tp_vectorcall", ifdef="PY_VERSION_HEX >= 0x030800b1"), EmptySlot("tp_vectorcall", ifdef="PY_VERSION_HEX >= 0x030800b1"),
EmptySlot("tp_print", ifdef="PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000"), EmptySlot("tp_print", ifdef="PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000"),
EmptySlot("tp_inline_values_offset", ifdef="PY_VERSION_HEX >= 0x030B00A2"),
# PyPy specific extension - only here to avoid C compiler warnings. # PyPy specific extension - only here to avoid C compiler warnings.
EmptySlot("tp_pypy_flags", ifdef="CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000"), EmptySlot("tp_pypy_flags", ifdef="CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000"),
) )
......
Cython/Utility/AsyncGen.c
View file @ 8e02ca09
...@@ -400,11 +400,11 @@ static PyTypeObject __pyx_AsyncGenType_type = { ...@@ -400,11 +400,11 @@ static PyTypeObject __pyx_AsyncGenType_type = {
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
#if CYTHON_USE_ASYNC_SLOTS #if CYTHON_USE_ASYNC_SLOTS
&__Pyx_async_gen_as_async, /* tp_as_async */ &__Pyx_async_gen_as_async, /* tp_as_async */
#else #else
0, /*tp_reserved*/ 0, /*tp_reserved*/
#endif #endif
(reprfunc)__Pyx_async_gen_repr, /* tp_repr */ (reprfunc)__Pyx_async_gen_repr, /* tp_repr */
0, /* tp_as_number */ 0, /* tp_as_number */
0, /* tp_as_sequence */ 0, /* tp_as_sequence */
0, /* tp_as_mapping */ 0, /* tp_as_mapping */
...@@ -417,20 +417,20 @@ static PyTypeObject __pyx_AsyncGenType_type = { ...@@ -417,20 +417,20 @@ static PyTypeObject __pyx_AsyncGenType_type = {
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_HAVE_FINALIZE, /* tp_flags */ Py_TPFLAGS_HAVE_FINALIZE, /* tp_flags */
0, /* tp_doc */ 0, /* tp_doc */
(traverseproc)__Pyx_async_gen_traverse, /* tp_traverse */ (traverseproc)__Pyx_async_gen_traverse, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */
#if CYTHON_USE_ASYNC_SLOTS && CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3 && PY_VERSION_HEX < 0x030500B1 #if CYTHON_USE_ASYNC_SLOTS && CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3 && PY_VERSION_HEX < 0x030500B1
// in order to (mis-)use tp_reserved above, we must also implement tp_richcompare // in order to (mis-)use tp_reserved above, we must also implement tp_richcompare
__Pyx_Coroutine_compare, /*tp_richcompare*/ __Pyx_Coroutine_compare, /*tp_richcompare*/
#else #else
0, /*tp_richcompare*/ 0, /*tp_richcompare*/
#endif #endif
offsetof(__pyx_CoroutineObject, gi_weakreflist), /* tp_weaklistoffset */ offsetof(__pyx_CoroutineObject, gi_weakreflist), /* tp_weaklistoffset */
0, /* tp_iter */ 0, /* tp_iter */
0, /* tp_iternext */ 0, /* tp_iternext */
__Pyx_async_gen_methods, /* tp_methods */ __Pyx_async_gen_methods, /* tp_methods */
__Pyx_async_gen_memberlist, /* tp_members */ __Pyx_async_gen_memberlist, /* tp_members */
__Pyx_async_gen_getsetlist, /* tp_getset */ __Pyx_async_gen_getsetlist, /* tp_getset */
0, /* tp_base */ 0, /* tp_base */
0, /* tp_dict */ 0, /* tp_dict */
0, /* tp_descr_get */ 0, /* tp_descr_get */
...@@ -447,9 +447,9 @@ static PyTypeObject __pyx_AsyncGenType_type = { ...@@ -447,9 +447,9 @@ static PyTypeObject __pyx_AsyncGenType_type = {
0, /* tp_subclasses */ 0, /* tp_subclasses */
0, /* tp_weaklist */ 0, /* tp_weaklist */
#if CYTHON_USE_TP_FINALIZE #if CYTHON_USE_TP_FINALIZE
0, /*tp_del*/ 0, /*tp_del*/
#else #else
__Pyx_Coroutine_del, /*tp_del*/ __Pyx_Coroutine_del, /*tp_del*/
#endif #endif
0, /* tp_version_tag */ 0, /* tp_version_tag */
#if CYTHON_USE_TP_FINALIZE #if CYTHON_USE_TP_FINALIZE
...@@ -463,9 +463,6 @@ static PyTypeObject __pyx_AsyncGenType_type = { ...@@ -463,9 +463,6 @@ static PyTypeObject __pyx_AsyncGenType_type = {
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/ 0, /*tp_print*/
#endif #endif
#if PY_VERSION_HEX >= 0x030B00A2
0, /*tp_inline_values_offset*/
#endif
#if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000 #if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000
0, /*tp_pypy_flags*/ 0, /*tp_pypy_flags*/
#endif #endif
...@@ -671,15 +668,15 @@ static __Pyx_PyAsyncMethodsStruct __Pyx_async_gen_asend_as_async = { ...@@ -671,15 +668,15 @@ static __Pyx_PyAsyncMethodsStruct __Pyx_async_gen_asend_as_async = {
static PyTypeObject __pyx__PyAsyncGenASendType_type = { static PyTypeObject __pyx__PyAsyncGenASendType_type = {
PyVarObject_HEAD_INIT(0, 0) PyVarObject_HEAD_INIT(0, 0)
"async_generator_asend", /* tp_name */ "async_generator_asend", /* tp_name */
sizeof(__pyx_PyAsyncGenASend), /* tp_basicsize */ sizeof(__pyx_PyAsyncGenASend), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
/* methods */ /* methods */
(destructor)__Pyx_async_gen_asend_dealloc, /* tp_dealloc */ (destructor)__Pyx_async_gen_asend_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */ 0, /* tp_vectorcall_offset */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
#if CYTHON_USE_ASYNC_SLOTS #if CYTHON_USE_ASYNC_SLOTS
&__Pyx_async_gen_asend_as_async, /* tp_as_async */ &__Pyx_async_gen_asend_as_async, /* tp_as_async */
#else #else
0, /*tp_reserved*/ 0, /*tp_reserved*/
#endif #endif
...@@ -699,14 +696,14 @@ static PyTypeObject __pyx__PyAsyncGenASendType_type = { ...@@ -699,14 +696,14 @@ static PyTypeObject __pyx__PyAsyncGenASendType_type = {
0, /* tp_clear */ 0, /* tp_clear */
#if CYTHON_USE_ASYNC_SLOTS && CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3 && PY_VERSION_HEX < 0x030500B1 #if CYTHON_USE_ASYNC_SLOTS && CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3 && PY_VERSION_HEX < 0x030500B1
// in order to (mis-)use tp_reserved above, we must also implement tp_richcompare // in order to (mis-)use tp_reserved above, we must also implement tp_richcompare
__Pyx_Coroutine_compare, /*tp_richcompare*/ __Pyx_Coroutine_compare, /*tp_richcompare*/
#else #else
0, /*tp_richcompare*/ 0, /*tp_richcompare*/
#endif #endif
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
PyObject_SelfIter, /* tp_iter */ PyObject_SelfIter, /* tp_iter */
(iternextfunc)__Pyx_async_gen_asend_iternext, /* tp_iternext */ (iternextfunc)__Pyx_async_gen_asend_iternext, /* tp_iternext */
__Pyx_async_gen_asend_methods, /* tp_methods */ __Pyx_async_gen_asend_methods, /* tp_methods */
0, /* tp_members */ 0, /* tp_members */
0, /* tp_getset */ 0, /* tp_getset */
0, /* tp_base */ 0, /* tp_base */
...@@ -735,9 +732,6 @@ static PyTypeObject __pyx__PyAsyncGenASendType_type = { ...@@ -735,9 +732,6 @@ static PyTypeObject __pyx__PyAsyncGenASendType_type = {
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/ 0, /*tp_print*/
#endif #endif
#if PY_VERSION_HEX >= 0x030B00A2
0, /*tp_inline_values_offset*/
#endif
#if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000 #if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000
0, /*tp_pypy_flags*/ 0, /*tp_pypy_flags*/
#endif #endif
...@@ -873,9 +867,6 @@ static PyTypeObject __pyx__PyAsyncGenWrappedValueType_type = { ...@@ -873,9 +867,6 @@ static PyTypeObject __pyx__PyAsyncGenWrappedValueType_type = {
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/ 0, /*tp_print*/
#endif #endif
#if PY_VERSION_HEX >= 0x030B00A2
0, /*tp_inline_values_offset*/
#endif
#if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000 #if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000
0, /*tp_pypy_flags*/ 0, /*tp_pypy_flags*/
#endif #endif
...@@ -1151,14 +1142,14 @@ static __Pyx_PyAsyncMethodsStruct __Pyx_async_gen_athrow_as_async = { ...@@ -1151,14 +1142,14 @@ static __Pyx_PyAsyncMethodsStruct __Pyx_async_gen_athrow_as_async = {
static PyTypeObject __pyx__PyAsyncGenAThrowType_type = { static PyTypeObject __pyx__PyAsyncGenAThrowType_type = {
PyVarObject_HEAD_INIT(0, 0) PyVarObject_HEAD_INIT(0, 0)
"async_generator_athrow", /* tp_name */ "async_generator_athrow", /* tp_name */
sizeof(__pyx_PyAsyncGenAThrow), /* tp_basicsize */ sizeof(__pyx_PyAsyncGenAThrow), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)__Pyx_async_gen_athrow_dealloc, /* tp_dealloc */ (destructor)__Pyx_async_gen_athrow_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */ 0, /* tp_vectorcall_offset */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
#if CYTHON_USE_ASYNC_SLOTS #if CYTHON_USE_ASYNC_SLOTS
&__Pyx_async_gen_athrow_as_async, /* tp_as_async */ &__Pyx_async_gen_athrow_as_async, /* tp_as_async */
#else #else
0, /*tp_reserved*/ 0, /*tp_reserved*/
#endif #endif
...@@ -1178,14 +1169,14 @@ static PyTypeObject __pyx__PyAsyncGenAThrowType_type = { ...@@ -1178,14 +1169,14 @@ static PyTypeObject __pyx__PyAsyncGenAThrowType_type = {
0, /* tp_clear */ 0, /* tp_clear */
#if CYTHON_USE_ASYNC_SLOTS && CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3 && PY_VERSION_HEX < 0x030500B1 #if CYTHON_USE_ASYNC_SLOTS && CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3 && PY_VERSION_HEX < 0x030500B1
// in order to (mis-)use tp_reserved above, we must also implement tp_richcompare // in order to (mis-)use tp_reserved above, we must also implement tp_richcompare
__Pyx_Coroutine_compare, /*tp_richcompare*/ __Pyx_Coroutine_compare, /*tp_richcompare*/
#else #else
0, /*tp_richcompare*/ 0, /*tp_richcompare*/
#endif #endif
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
PyObject_SelfIter, /* tp_iter */ PyObject_SelfIter, /* tp_iter */
(iternextfunc)__Pyx_async_gen_athrow_iternext, /* tp_iternext */ (iternextfunc)__Pyx_async_gen_athrow_iternext, /* tp_iternext */
__Pyx_async_gen_athrow_methods, /* tp_methods */ __Pyx_async_gen_athrow_methods, /* tp_methods */
0, /* tp_members */ 0, /* tp_members */
0, /* tp_getset */ 0, /* tp_getset */
0, /* tp_base */ 0, /* tp_base */
...@@ -1214,9 +1205,6 @@ static PyTypeObject __pyx__PyAsyncGenAThrowType_type = { ...@@ -1214,9 +1205,6 @@ static PyTypeObject __pyx__PyAsyncGenAThrowType_type = {
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/ 0, /*tp_print*/
#endif #endif
#if PY_VERSION_HEX >= 0x030B00A2
0, /*tp_inline_values_offset*/
#endif
#if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000 #if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000
0, /*tp_pypy_flags*/ 0, /*tp_pypy_flags*/
#endif #endif
......
Cython/Utility/Coroutine.c
View file @ 8e02ca09
...@@ -1622,11 +1622,8 @@ static PyTypeObject __pyx_CoroutineAwaitType_type = { ...@@ -1622,11 +1622,8 @@ static PyTypeObject __pyx_CoroutineAwaitType_type = {
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/ 0, /*tp_print*/
#endif #endif
#if PY_VERSION_HEX >= 0x030B00A2
0, /*tp_inline_values_offset*/
#endif
#if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000 #if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000
0, /*tp_pypy_flags*/ 0, /*tp_pypy_flags*/
#endif #endif
}; };
#endif /* CYTHON_USE_TYPE_SPECS */ #endif /* CYTHON_USE_TYPE_SPECS */
...@@ -1814,11 +1811,8 @@ static PyTypeObject __pyx_CoroutineType_type = { ...@@ -1814,11 +1811,8 @@ static PyTypeObject __pyx_CoroutineType_type = {
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/ 0, /*tp_print*/
#endif #endif
#if PY_VERSION_HEX >= 0x030B00A2
0, /*tp_inline_values_offset*/
#endif
#if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000 #if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000
0, /*tp_pypy_flags*/ 0, /*tp_pypy_flags*/
#endif #endif
}; };
#endif /* CYTHON_USE_TYPE_SPECS */ #endif /* CYTHON_USE_TYPE_SPECS */
...@@ -1967,11 +1961,8 @@ static PyTypeObject __pyx_IterableCoroutineType_type = { ...@@ -1967,11 +1961,8 @@ static PyTypeObject __pyx_IterableCoroutineType_type = {
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/ 0, /*tp_print*/
#endif #endif
#if PY_VERSION_HEX >= 0x030B00A2
0, /*tp_inline_values_offset*/
#endif
#if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000 #if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000
0, /*tp_pypy_flags*/ 0, /*tp_pypy_flags*/
#endif #endif
}; };
#endif /* CYTHON_USE_TYPE_SPECS */ #endif /* CYTHON_USE_TYPE_SPECS */
...@@ -2116,11 +2107,8 @@ static PyTypeObject __pyx_GeneratorType_type = { ...@@ -2116,11 +2107,8 @@ static PyTypeObject __pyx_GeneratorType_type = {
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/ 0, /*tp_print*/
#endif #endif
#if PY_VERSION_HEX >= 0x030B00A2
0, /*tp_inline_values_offset*/
#endif
#if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000 #if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000
0, /*tp_pypy_flags*/ 0, /*tp_pypy_flags*/
#endif #endif
}; };
#endif /* CYTHON_USE_TYPE_SPECS */ #endif /* CYTHON_USE_TYPE_SPECS */
...@@ -2527,11 +2515,8 @@ static PyTypeObject __Pyx__PyExc_StopAsyncIteration_type = { ...@@ -2527,11 +2515,8 @@ static PyTypeObject __Pyx__PyExc_StopAsyncIteration_type = {
#if PY_VERSION_HEX >= 0x030400a1 #if PY_VERSION_HEX >= 0x030400a1
0, /*tp_finalize*/ 0, /*tp_finalize*/
#endif #endif
#if PY_VERSION_HEX >= 0x030B00A2
0, /*tp_inline_values_offset*/
#endif
#if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000 #if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000
0, /*tp_pypy_flags*/ 0, /*tp_pypy_flags*/
#endif #endif
}; };
#endif #endif
......
Cython/Utility/CythonFunction.c
View file @ 8e02ca09
...@@ -1041,11 +1041,8 @@ static PyTypeObject __pyx_CyFunctionType_type = { ...@@ -1041,11 +1041,8 @@ static PyTypeObject __pyx_CyFunctionType_type = {
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/ 0, /*tp_print*/
#endif #endif
#if PY_VERSION_HEX >= 0x030B00A2
0, /*tp_inline_values_offset*/
#endif
#if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000 #if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000
0, /*tp_pypy_flags*/ 0, /*tp_pypy_flags*/
#endif #endif
}; };
#endif /* CYTHON_USE_TYPE_SPECS */ #endif /* CYTHON_USE_TYPE_SPECS */
...@@ -1585,11 +1582,8 @@ static PyTypeObject __pyx_FusedFunctionType_type = { ...@@ -1585,11 +1582,8 @@ static PyTypeObject __pyx_FusedFunctionType_type = {
#if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000
0, /*tp_print*/ 0, /*tp_print*/
#endif #endif
#if PY_VERSION_HEX >= 0x030B00A2
0, /*tp_inline_values_offset*/
#endif
#if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000 #if CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM+0 >= 0x06000000
0, /*tp_pypy_flags*/ 0, /*tp_pypy_flags*/
#endif #endif
}; };
#endif #endif
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7