Skip to content

C
cython
Commit 4ce2721e authored by Stefan Behnel's avatar Stefan Behnel
Browse files
Options

Revert "Add tp_inline_values_offset to slot_table (0.29.x) (GH-4473)" 

This reverts commit f5aa00bb.
parent 1faf51f0
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 53 deletions
Cython/Compiler/TypeSlots.py
View file @ 4ce2721e
...@@ -890,7 +890,6 @@ slot_table = ( ...@@ -890,7 +890,6 @@ slot_table = (
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"),
) )
#------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------
......
Cython/Utility/AsyncGen.c
View file @ 4ce2721e
...@@ -364,11 +364,11 @@ static PyTypeObject __pyx_AsyncGenType_type = { ...@@ -364,11 +364,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 */
...@@ -381,20 +381,20 @@ static PyTypeObject __pyx_AsyncGenType_type = { ...@@ -381,20 +381,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 */
...@@ -411,9 +411,9 @@ static PyTypeObject __pyx_AsyncGenType_type = { ...@@ -411,9 +411,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
...@@ -427,9 +427,6 @@ static PyTypeObject __pyx_AsyncGenType_type = { ...@@ -427,9 +427,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
}; };
...@@ -601,15 +598,15 @@ static __Pyx_PyAsyncMethodsStruct __Pyx_async_gen_asend_as_async = { ...@@ -601,15 +598,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_print */ 0, /* tp_print */
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
...@@ -665,9 +662,6 @@ static PyTypeObject __pyx__PyAsyncGenASendType_type = { ...@@ -665,9 +662,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
}; };
...@@ -783,9 +777,6 @@ static PyTypeObject __pyx__PyAsyncGenWrappedValueType_type = { ...@@ -783,9 +777,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
}; };
...@@ -1008,14 +999,14 @@ static __Pyx_PyAsyncMethodsStruct __Pyx_async_gen_athrow_as_async = { ...@@ -1008,14 +999,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_print */ 0, /* tp_print */
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
...@@ -1035,14 +1026,14 @@ static PyTypeObject __pyx__PyAsyncGenAThrowType_type = { ...@@ -1035,14 +1026,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 */
...@@ -1071,9 +1062,6 @@ static PyTypeObject __pyx__PyAsyncGenAThrowType_type = { ...@@ -1071,9 +1062,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
}; };
......
Cython/Utility/Coroutine.c
View file @ 4ce2721e
...@@ -1563,9 +1563,6 @@ static PyTypeObject __pyx_CoroutineAwaitType_type = { ...@@ -1563,9 +1563,6 @@ 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 PY_VERSION_HEX < 0x030500B1 || defined(__Pyx_IterableCoroutine_USED) || CYTHON_USE_ASYNC_SLOTS #if PY_VERSION_HEX < 0x030500B1 || defined(__Pyx_IterableCoroutine_USED) || CYTHON_USE_ASYNC_SLOTS
...@@ -1723,9 +1720,6 @@ static PyTypeObject __pyx_CoroutineType_type = { ...@@ -1723,9 +1720,6 @@ 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
}; };
static int __pyx_Coroutine_init(void) { static int __pyx_Coroutine_init(void) {
...@@ -1837,9 +1831,6 @@ static PyTypeObject __pyx_IterableCoroutineType_type = { ...@@ -1837,9 +1831,6 @@ 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
}; };
...@@ -1948,9 +1939,6 @@ static PyTypeObject __pyx_GeneratorType_type = { ...@@ -1948,9 +1939,6 @@ 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
}; };
static int __pyx_Generator_init(void) { static int __pyx_Generator_init(void) {
...@@ -2347,9 +2335,6 @@ static PyTypeObject __Pyx__PyExc_StopAsyncIteration_type = { ...@@ -2347,9 +2335,6 @@ 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
}; };
#endif #endif
......
Cython/Utility/CythonFunction.c
View file @ 4ce2721e
...@@ -736,9 +736,6 @@ static PyTypeObject __pyx_CyFunctionType_type = { ...@@ -736,9 +736,6 @@ 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
}; };
...@@ -1268,9 +1265,6 @@ static PyTypeObject __pyx_FusedFunctionType_type = { ...@@ -1268,9 +1265,6 @@ 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
}; };
static int __pyx_FusedFunction_init(void) { static int __pyx_FusedFunction_init(void) {
......
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