From 359c7dde3bb074e029686913f531457eb121d1dd Mon Sep 17 00:00:00 2001 From: Ken Jin Date: Sun, 16 Feb 2025 03:01:24 +0800 Subject: [PATCH] gh-129989: Properly disable tailcall interp in configure (GH-129991) Co-authored-by: Zanie Blue --- Lib/test/test_generated_cases.py | 106 ++--- ...-02-11-07-55-28.gh-issue-129989.kaSKlD.rst | 1 + Python/bytecodes.c | 4 +- Python/ceval.c | 8 +- Python/ceval_macros.h | 2 +- Python/generated_cases.c.h | 446 +++++++++--------- Python/opcode_targets.h | 2 +- Tools/cases_generator/target_generator.py | 2 +- Tools/cases_generator/tier1_generator.py | 2 +- 9 files changed, 287 insertions(+), 286 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2025-02-11-07-55-28.gh-issue-129989.kaSKlD.rst diff --git a/Lib/test/test_generated_cases.py b/Lib/test/test_generated_cases.py index f9a54f3b412..ff6b566faa4 100644 --- a/Lib/test/test_generated_cases.py +++ b/Lib/test/test_generated_cases.py @@ -304,7 +304,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -326,7 +326,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -351,7 +351,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -377,7 +377,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -404,7 +404,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -434,7 +434,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -466,7 +466,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP1) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP1; (void)(opcode); #endif @@ -481,7 +481,7 @@ class TestGeneratedCases(unittest.TestCase): } TARGET(OP3) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP3; (void)(opcode); #endif @@ -519,7 +519,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(A) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = A; (void)(opcode); #endif @@ -540,7 +540,7 @@ class TestGeneratedCases(unittest.TestCase): } TARGET(B) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = B; (void)(opcode); #endif @@ -581,7 +581,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -604,7 +604,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -631,7 +631,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -666,7 +666,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -697,7 +697,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -728,7 +728,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -763,7 +763,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -804,7 +804,7 @@ class TestGeneratedCases(unittest.TestCase): } TARGET(OP1) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP1; (void)(opcode); #endif @@ -826,7 +826,7 @@ class TestGeneratedCases(unittest.TestCase): } TARGET(OP3) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP3; (void)(opcode); #endif @@ -861,7 +861,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -887,7 +887,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP1) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP1; (void)(opcode); #endif @@ -910,7 +910,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP1) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP1; (void)(opcode); #endif @@ -936,7 +936,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP1) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP1; (void)(opcode); #endif @@ -947,7 +947,7 @@ class TestGeneratedCases(unittest.TestCase): } TARGET(OP2) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP2; (void)(opcode); #endif @@ -968,7 +968,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -995,7 +995,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -1027,7 +1027,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -1055,7 +1055,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -1085,7 +1085,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -1130,7 +1130,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(M) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = M; (void)(opcode); #endif @@ -1178,7 +1178,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(M) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = M; (void)(opcode); #endif @@ -1215,7 +1215,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -1240,7 +1240,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(M) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = M; (void)(opcode); #endif @@ -1261,7 +1261,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -1283,7 +1283,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(M) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = M; (void)(opcode); #endif @@ -1323,7 +1323,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -1349,7 +1349,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -1391,7 +1391,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(INST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INST; (void)(opcode); #endif @@ -1421,7 +1421,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(TEST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = TEST; (void)(opcode); #endif @@ -1465,7 +1465,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(TEST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = TEST; (void)(opcode); #endif @@ -1508,7 +1508,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(TEST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = TEST; (void)(opcode); #endif @@ -1560,7 +1560,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(TEST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = TEST; (void)(opcode); #endif @@ -1612,7 +1612,7 @@ class TestGeneratedCases(unittest.TestCase): output = """ TARGET(TEST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = TEST; (void)(opcode); #endif @@ -1657,7 +1657,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP1) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP1; (void)(opcode); #endif @@ -1668,7 +1668,7 @@ class TestGeneratedCases(unittest.TestCase): } TARGET(OP2) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP2; (void)(opcode); #endif @@ -1730,7 +1730,7 @@ class TestGeneratedCases(unittest.TestCase): output = """ TARGET(BALANCED) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BALANCED; (void)(opcode); #endif @@ -1756,7 +1756,7 @@ class TestGeneratedCases(unittest.TestCase): output = """ TARGET(BALANCED) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BALANCED; (void)(opcode); #endif @@ -1778,7 +1778,7 @@ class TestGeneratedCases(unittest.TestCase): output = """ TARGET(BALANCED) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BALANCED; (void)(opcode); #endif @@ -1803,7 +1803,7 @@ class TestGeneratedCases(unittest.TestCase): output = """ TARGET(BALANCED) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BALANCED; (void)(opcode); #endif @@ -1829,7 +1829,7 @@ class TestGeneratedCases(unittest.TestCase): output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -1868,7 +1868,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -1906,7 +1906,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif @@ -1941,7 +1941,7 @@ class TestGeneratedCases(unittest.TestCase): """ output = """ TARGET(OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = OP; (void)(opcode); #endif diff --git a/Misc/NEWS.d/next/Build/2025-02-11-07-55-28.gh-issue-129989.kaSKlD.rst b/Misc/NEWS.d/next/Build/2025-02-11-07-55-28.gh-issue-129989.kaSKlD.rst new file mode 100644 index 00000000000..1b1e66144ed --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-02-11-07-55-28.gh-issue-129989.kaSKlD.rst @@ -0,0 +1 @@ +Fix a bug where the tailcall interpreter was enabled when ``--without-tail-call-interp`` was provided to the configure script. diff --git a/Python/bytecodes.c b/Python/bytecodes.c index b18b0075315..3f8f711c559 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -5234,7 +5234,7 @@ dummy_func( } #endif RELOAD_STACK(); -#ifdef Py_TAIL_CALL_INTERP +#if Py_TAIL_CALL_INTERP int opcode; #endif DISPATCH(); @@ -5278,7 +5278,7 @@ dummy_func( assert(!_PyErr_Occurred(tstate)); #endif RELOAD_STACK(); -#ifdef Py_TAIL_CALL_INTERP +#if Py_TAIL_CALL_INTERP int opcode; #endif DISPATCH(); diff --git a/Python/ceval.c b/Python/ceval.c index 931915c8cf7..28b26ffb5de 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -779,7 +779,7 @@ _PyObjectArray_Free(PyObject **array, PyObject **scratch) /* This setting is reversed below following _PyEval_EvalFrameDefault */ #endif -#ifdef Py_TAIL_CALL_INTERP +#if Py_TAIL_CALL_INTERP #include "opcode_targets.h" #include "generated_cases.c.h" #endif @@ -790,7 +790,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int _Py_EnsureTstateNotNULL(tstate); CALL_STAT_INC(pyeval_calls); -#if USE_COMPUTED_GOTOS && !defined(Py_TAIL_CALL_INTERP) +#if USE_COMPUTED_GOTOS && !Py_TAIL_CALL_INTERP /* Import the static jump table */ #include "opcode_targets.h" #endif @@ -863,7 +863,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int next_instr = frame->instr_ptr; monitor_throw(tstate, frame, next_instr); stack_pointer = _PyFrame_GetStackPointer(frame); -#ifdef Py_TAIL_CALL_INTERP +#if Py_TAIL_CALL_INTERP return _TAIL_CALL_error(frame, stack_pointer, tstate, next_instr, 0); #else goto error; @@ -876,7 +876,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int const _PyUOpInstruction *next_uop = NULL; #endif -#ifdef Py_TAIL_CALL_INTERP +#if Py_TAIL_CALL_INTERP return _TAIL_CALL_start_frame(frame, NULL, tstate, NULL, 0); #else goto start_frame; diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h index 2cb78fa80b4..1bef2b845d0 100644 --- a/Python/ceval_macros.h +++ b/Python/ceval_macros.h @@ -73,7 +73,7 @@ #define TAIL_CALL_PARAMS _PyInterpreterFrame *frame, _PyStackRef *stack_pointer, PyThreadState *tstate, _Py_CODEUNIT *next_instr, int oparg #define TAIL_CALL_ARGS frame, stack_pointer, tstate, next_instr, oparg -#ifdef Py_TAIL_CALL_INTERP +#if Py_TAIL_CALL_INTERP // Note: [[clang::musttail]] works for GCC 15, but not __attribute__((musttail)) at the moment. # define Py_MUSTTAIL [[clang::musttail]] # define Py_PRESERVE_NONE_CC __attribute__((preserve_none)) diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 094ca1f3c52..e7f8fdce41b 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -19,7 +19,7 @@ TARGET(BINARY_OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP; (void)(opcode); #endif @@ -82,7 +82,7 @@ } TARGET(BINARY_OP_ADD_FLOAT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_ADD_FLOAT; (void)(opcode); #endif @@ -136,7 +136,7 @@ } TARGET(BINARY_OP_ADD_INT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_ADD_INT; (void)(opcode); #endif @@ -191,7 +191,7 @@ } TARGET(BINARY_OP_ADD_UNICODE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_ADD_UNICODE; (void)(opcode); #endif @@ -244,7 +244,7 @@ } TARGET(BINARY_OP_EXTEND) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_EXTEND; (void)(opcode); #endif @@ -308,7 +308,7 @@ } TARGET(BINARY_OP_INPLACE_ADD_UNICODE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_INPLACE_ADD_UNICODE; (void)(opcode); #endif @@ -395,7 +395,7 @@ } TARGET(BINARY_OP_MULTIPLY_FLOAT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_MULTIPLY_FLOAT; (void)(opcode); #endif @@ -449,7 +449,7 @@ } TARGET(BINARY_OP_MULTIPLY_INT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_MULTIPLY_INT; (void)(opcode); #endif @@ -504,7 +504,7 @@ } TARGET(BINARY_OP_SUBSCR_DICT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_SUBSCR_DICT; (void)(opcode); #endif @@ -561,7 +561,7 @@ } TARGET(BINARY_OP_SUBSCR_GETITEM) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_SUBSCR_GETITEM; (void)(opcode); #endif @@ -646,7 +646,7 @@ } TARGET(BINARY_OP_SUBSCR_LIST_INT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_SUBSCR_LIST_INT; (void)(opcode); #endif @@ -716,7 +716,7 @@ } TARGET(BINARY_OP_SUBSCR_STR_INT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_SUBSCR_STR_INT; (void)(opcode); #endif @@ -778,7 +778,7 @@ } TARGET(BINARY_OP_SUBSCR_TUPLE_INT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_SUBSCR_TUPLE_INT; (void)(opcode); #endif @@ -836,7 +836,7 @@ } TARGET(BINARY_OP_SUBTRACT_FLOAT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_SUBTRACT_FLOAT; (void)(opcode); #endif @@ -890,7 +890,7 @@ } TARGET(BINARY_OP_SUBTRACT_INT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_OP_SUBTRACT_INT; (void)(opcode); #endif @@ -945,7 +945,7 @@ } TARGET(BINARY_SLICE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BINARY_SLICE; (void)(opcode); #endif @@ -1005,7 +1005,7 @@ } TARGET(BUILD_LIST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BUILD_LIST; (void)(opcode); #endif @@ -1027,7 +1027,7 @@ } TARGET(BUILD_MAP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BUILD_MAP; (void)(opcode); #endif @@ -1079,7 +1079,7 @@ } TARGET(BUILD_SET) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BUILD_SET; (void)(opcode); #endif @@ -1137,7 +1137,7 @@ } TARGET(BUILD_SLICE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BUILD_SLICE; (void)(opcode); #endif @@ -1172,7 +1172,7 @@ } TARGET(BUILD_STRING) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BUILD_STRING; (void)(opcode); #endif @@ -1219,7 +1219,7 @@ } TARGET(BUILD_TUPLE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = BUILD_TUPLE; (void)(opcode); #endif @@ -1241,7 +1241,7 @@ } TARGET(CACHE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CACHE; (void)(opcode); #endif @@ -1254,7 +1254,7 @@ } TARGET(CALL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL; (void)(opcode); #endif @@ -1444,7 +1444,7 @@ } TARGET(CALL_ALLOC_AND_ENTER_INIT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_ALLOC_AND_ENTER_INIT; (void)(opcode); #endif @@ -1574,7 +1574,7 @@ } TARGET(CALL_BOUND_METHOD_EXACT_ARGS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_BOUND_METHOD_EXACT_ARGS; (void)(opcode); #endif @@ -1713,7 +1713,7 @@ } TARGET(CALL_BOUND_METHOD_GENERAL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_BOUND_METHOD_GENERAL; (void)(opcode); #endif @@ -1835,7 +1835,7 @@ } TARGET(CALL_BUILTIN_CLASS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_BUILTIN_CLASS; (void)(opcode); #endif @@ -1945,7 +1945,7 @@ } TARGET(CALL_BUILTIN_FAST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_BUILTIN_FAST; (void)(opcode); #endif @@ -2061,7 +2061,7 @@ } TARGET(CALL_BUILTIN_FAST_WITH_KEYWORDS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_BUILTIN_FAST_WITH_KEYWORDS; (void)(opcode); #endif @@ -2178,7 +2178,7 @@ } TARGET(CALL_BUILTIN_O) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_BUILTIN_O; (void)(opcode); #endif @@ -2274,7 +2274,7 @@ } TARGET(CALL_FUNCTION_EX) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_FUNCTION_EX; (void)(opcode); #endif @@ -2466,7 +2466,7 @@ } TARGET(CALL_INTRINSIC_1) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_INTRINSIC_1; (void)(opcode); #endif @@ -2496,7 +2496,7 @@ } TARGET(CALL_INTRINSIC_2) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_INTRINSIC_2; (void)(opcode); #endif @@ -2535,7 +2535,7 @@ } TARGET(CALL_ISINSTANCE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_ISINSTANCE; (void)(opcode); #endif @@ -2604,7 +2604,7 @@ } TARGET(CALL_KW) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_KW; (void)(opcode); #endif @@ -2798,7 +2798,7 @@ } TARGET(CALL_KW_BOUND_METHOD) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_KW_BOUND_METHOD; (void)(opcode); #endif @@ -2931,7 +2931,7 @@ } TARGET(CALL_KW_NON_PY) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_KW_NON_PY; (void)(opcode); #endif @@ -3064,7 +3064,7 @@ } TARGET(CALL_KW_PY) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_KW_PY; (void)(opcode); #endif @@ -3171,7 +3171,7 @@ } TARGET(CALL_LEN) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_LEN; (void)(opcode); #endif @@ -3238,7 +3238,7 @@ } TARGET(CALL_LIST_APPEND) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_LIST_APPEND; (void)(opcode); #endif @@ -3302,7 +3302,7 @@ } TARGET(CALL_METHOD_DESCRIPTOR_FAST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_METHOD_DESCRIPTOR_FAST; (void)(opcode); #endif @@ -3424,7 +3424,7 @@ } TARGET(CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS; (void)(opcode); #endif @@ -3546,7 +3546,7 @@ } TARGET(CALL_METHOD_DESCRIPTOR_NOARGS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_METHOD_DESCRIPTOR_NOARGS; (void)(opcode); #endif @@ -3650,7 +3650,7 @@ } TARGET(CALL_METHOD_DESCRIPTOR_O) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_METHOD_DESCRIPTOR_O; (void)(opcode); #endif @@ -3765,7 +3765,7 @@ } TARGET(CALL_NON_PY_GENERAL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_NON_PY_GENERAL; (void)(opcode); #endif @@ -3886,7 +3886,7 @@ } TARGET(CALL_PY_EXACT_ARGS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_PY_EXACT_ARGS; (void)(opcode); #endif @@ -3997,7 +3997,7 @@ } TARGET(CALL_PY_GENERAL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_PY_GENERAL; (void)(opcode); #endif @@ -4093,7 +4093,7 @@ } TARGET(CALL_STR_1) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_STR_1; (void)(opcode); #endif @@ -4166,7 +4166,7 @@ } TARGET(CALL_TUPLE_1) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_TUPLE_1; (void)(opcode); #endif @@ -4239,7 +4239,7 @@ } TARGET(CALL_TYPE_1) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CALL_TYPE_1; (void)(opcode); #endif @@ -4283,7 +4283,7 @@ } TARGET(CHECK_EG_MATCH) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CHECK_EG_MATCH; (void)(opcode); #endif @@ -4354,7 +4354,7 @@ } TARGET(CHECK_EXC_MATCH) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CHECK_EXC_MATCH; (void)(opcode); #endif @@ -4391,7 +4391,7 @@ } TARGET(CLEANUP_THROW) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CLEANUP_THROW; (void)(opcode); #endif @@ -4450,7 +4450,7 @@ } TARGET(COMPARE_OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = COMPARE_OP; (void)(opcode); #endif @@ -4523,7 +4523,7 @@ } TARGET(COMPARE_OP_FLOAT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = COMPARE_OP_FLOAT; (void)(opcode); #endif @@ -4575,7 +4575,7 @@ } TARGET(COMPARE_OP_INT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = COMPARE_OP_INT; (void)(opcode); #endif @@ -4639,7 +4639,7 @@ } TARGET(COMPARE_OP_STR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = COMPARE_OP_STR; (void)(opcode); #endif @@ -4692,7 +4692,7 @@ } TARGET(CONTAINS_OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CONTAINS_OP; (void)(opcode); #endif @@ -4752,7 +4752,7 @@ } TARGET(CONTAINS_OP_DICT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CONTAINS_OP_DICT; (void)(opcode); #endif @@ -4800,7 +4800,7 @@ } TARGET(CONTAINS_OP_SET) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CONTAINS_OP_SET; (void)(opcode); #endif @@ -4849,7 +4849,7 @@ } TARGET(CONVERT_VALUE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = CONVERT_VALUE; (void)(opcode); #endif @@ -4881,7 +4881,7 @@ } TARGET(COPY) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = COPY; (void)(opcode); #endif @@ -4900,7 +4900,7 @@ } TARGET(COPY_FREE_VARS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = COPY_FREE_VARS; (void)(opcode); #endif @@ -4922,7 +4922,7 @@ } TARGET(DELETE_ATTR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = DELETE_ATTR; (void)(opcode); #endif @@ -4947,7 +4947,7 @@ } TARGET(DELETE_DEREF) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = DELETE_DEREF; (void)(opcode); #endif @@ -4971,7 +4971,7 @@ } TARGET(DELETE_FAST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = DELETE_FAST; (void)(opcode); #endif @@ -4997,7 +4997,7 @@ } TARGET(DELETE_GLOBAL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = DELETE_GLOBAL; (void)(opcode); #endif @@ -5023,7 +5023,7 @@ } TARGET(DELETE_NAME) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = DELETE_NAME; (void)(opcode); #endif @@ -5056,7 +5056,7 @@ } TARGET(DELETE_SUBSCR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = DELETE_SUBSCR; (void)(opcode); #endif @@ -5089,7 +5089,7 @@ } TARGET(DICT_MERGE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = DICT_MERGE; (void)(opcode); #endif @@ -5128,7 +5128,7 @@ } TARGET(DICT_UPDATE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = DICT_UPDATE; (void)(opcode); #endif @@ -5171,7 +5171,7 @@ } TARGET(END_ASYNC_FOR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = END_ASYNC_FOR; (void)(opcode); #endif @@ -5214,7 +5214,7 @@ } TARGET(END_FOR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = END_FOR; (void)(opcode); #endif @@ -5236,7 +5236,7 @@ } TARGET(END_SEND) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = END_SEND; (void)(opcode); #endif @@ -5260,7 +5260,7 @@ } TARGET(ENTER_EXECUTOR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = ENTER_EXECUTOR; (void)(opcode); #endif @@ -5299,7 +5299,7 @@ } TARGET(EXIT_INIT_CHECK) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = EXIT_INIT_CHECK; (void)(opcode); #endif @@ -5323,7 +5323,7 @@ } TARGET(EXTENDED_ARG) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = EXTENDED_ARG; (void)(opcode); #endif @@ -5339,7 +5339,7 @@ } TARGET(FORMAT_SIMPLE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = FORMAT_SIMPLE; (void)(opcode); #endif @@ -5378,7 +5378,7 @@ } TARGET(FORMAT_WITH_SPEC) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = FORMAT_WITH_SPEC; (void)(opcode); #endif @@ -5414,7 +5414,7 @@ } TARGET(FOR_ITER) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = FOR_ITER; (void)(opcode); #endif @@ -5480,7 +5480,7 @@ } TARGET(FOR_ITER_GEN) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = FOR_ITER_GEN; (void)(opcode); #endif @@ -5546,7 +5546,7 @@ } TARGET(FOR_ITER_LIST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = FOR_ITER_LIST; (void)(opcode); #endif @@ -5607,7 +5607,7 @@ } TARGET(FOR_ITER_RANGE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = FOR_ITER_RANGE; (void)(opcode); #endif @@ -5662,7 +5662,7 @@ } TARGET(FOR_ITER_TUPLE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = FOR_ITER_TUPLE; (void)(opcode); #endif @@ -5720,7 +5720,7 @@ } TARGET(GET_AITER) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = GET_AITER; (void)(opcode); #endif @@ -5781,7 +5781,7 @@ } TARGET(GET_ANEXT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = GET_ANEXT; (void)(opcode); #endif @@ -5805,7 +5805,7 @@ } TARGET(GET_AWAITABLE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = GET_AWAITABLE; (void)(opcode); #endif @@ -5834,7 +5834,7 @@ } TARGET(GET_ITER) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = GET_ITER; (void)(opcode); #endif @@ -5864,7 +5864,7 @@ } TARGET(GET_LEN) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = GET_LEN; (void)(opcode); #endif @@ -5893,7 +5893,7 @@ } TARGET(GET_YIELD_FROM_ITER) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = GET_YIELD_FROM_ITER; (void)(opcode); #endif @@ -5946,7 +5946,7 @@ } TARGET(IMPORT_FROM) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = IMPORT_FROM; (void)(opcode); #endif @@ -5971,7 +5971,7 @@ } TARGET(IMPORT_NAME) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = IMPORT_NAME; (void)(opcode); #endif @@ -6010,7 +6010,7 @@ } TARGET(INSTRUMENTED_CALL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_CALL; (void)(opcode); #endif @@ -6211,7 +6211,7 @@ } TARGET(INSTRUMENTED_CALL_FUNCTION_EX) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_CALL_FUNCTION_EX; (void)(opcode); #endif @@ -6403,7 +6403,7 @@ } TARGET(INSTRUMENTED_CALL_KW) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_CALL_KW; (void)(opcode); #endif @@ -6606,7 +6606,7 @@ } TARGET(INSTRUMENTED_END_FOR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_END_FOR; (void)(opcode); #endif @@ -6637,7 +6637,7 @@ } TARGET(INSTRUMENTED_END_SEND) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_END_SEND; (void)(opcode); #endif @@ -6671,7 +6671,7 @@ } TARGET(INSTRUMENTED_FOR_ITER) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_FOR_ITER; (void)(opcode); #endif @@ -6713,7 +6713,7 @@ } TARGET(INSTRUMENTED_INSTRUCTION) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_INSTRUCTION; (void)(opcode); #endif @@ -6740,7 +6740,7 @@ } TARGET(INSTRUMENTED_JUMP_BACKWARD) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_JUMP_BACKWARD; (void)(opcode); #endif @@ -6771,7 +6771,7 @@ } TARGET(INSTRUMENTED_JUMP_FORWARD) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_JUMP_FORWARD; (void)(opcode); #endif @@ -6785,7 +6785,7 @@ } TARGET(INSTRUMENTED_LINE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_LINE; (void)(opcode); #endif @@ -6827,7 +6827,7 @@ } TARGET(INSTRUMENTED_LOAD_SUPER_ATTR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_LOAD_SUPER_ATTR; (void)(opcode); #endif @@ -6947,7 +6947,7 @@ } TARGET(INSTRUMENTED_NOT_TAKEN) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_NOT_TAKEN; (void)(opcode); #endif @@ -6963,7 +6963,7 @@ } TARGET(INSTRUMENTED_POP_ITER) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_POP_ITER; (void)(opcode); #endif @@ -6985,7 +6985,7 @@ } TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_POP_JUMP_IF_FALSE; (void)(opcode); #endif @@ -7006,7 +7006,7 @@ } TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_POP_JUMP_IF_NONE; (void)(opcode); #endif @@ -7031,7 +7031,7 @@ } TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_POP_JUMP_IF_NOT_NONE; (void)(opcode); #endif @@ -7054,7 +7054,7 @@ } TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_POP_JUMP_IF_TRUE; (void)(opcode); #endif @@ -7075,7 +7075,7 @@ } TARGET(INSTRUMENTED_RESUME) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_RESUME; (void)(opcode); #endif @@ -7156,7 +7156,7 @@ } TARGET(INSTRUMENTED_RETURN_VALUE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_RETURN_VALUE; (void)(opcode); #endif @@ -7206,7 +7206,7 @@ } TARGET(INSTRUMENTED_YIELD_VALUE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INSTRUMENTED_YIELD_VALUE; (void)(opcode); #endif @@ -7278,7 +7278,7 @@ } TARGET(INTERPRETER_EXIT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = INTERPRETER_EXIT; (void)(opcode); #endif @@ -7301,7 +7301,7 @@ } TARGET(IS_OP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = IS_OP; (void)(opcode); #endif @@ -7334,7 +7334,7 @@ } TARGET(JUMP_BACKWARD) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = JUMP_BACKWARD; (void)(opcode); #endif @@ -7383,7 +7383,7 @@ } TARGET(JUMP_BACKWARD_JIT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = JUMP_BACKWARD_JIT; (void)(opcode); #endif @@ -7456,7 +7456,7 @@ } TARGET(JUMP_BACKWARD_NO_INTERRUPT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = JUMP_BACKWARD_NO_INTERRUPT; (void)(opcode); #endif @@ -7474,7 +7474,7 @@ } TARGET(JUMP_BACKWARD_NO_JIT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = JUMP_BACKWARD_NO_JIT; (void)(opcode); #endif @@ -7510,7 +7510,7 @@ } TARGET(JUMP_FORWARD) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = JUMP_FORWARD; (void)(opcode); #endif @@ -7522,7 +7522,7 @@ } TARGET(LIST_APPEND) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LIST_APPEND; (void)(opcode); #endif @@ -7544,7 +7544,7 @@ } TARGET(LIST_EXTEND) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LIST_EXTEND; (void)(opcode); #endif @@ -7591,7 +7591,7 @@ } TARGET(LOAD_ATTR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR; (void)(opcode); #endif @@ -7687,7 +7687,7 @@ } TARGET(LOAD_ATTR_CLASS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_CLASS; (void)(opcode); #endif @@ -7744,7 +7744,7 @@ } TARGET(LOAD_ATTR_CLASS_WITH_METACLASS_CHECK) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_CLASS_WITH_METACLASS_CHECK; (void)(opcode); #endif @@ -7811,7 +7811,7 @@ } TARGET(LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN; (void)(opcode); #endif @@ -7869,7 +7869,7 @@ } TARGET(LOAD_ATTR_INSTANCE_VALUE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_INSTANCE_VALUE; (void)(opcode); #endif @@ -7946,7 +7946,7 @@ } TARGET(LOAD_ATTR_METHOD_LAZY_DICT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_METHOD_LAZY_DICT; (void)(opcode); #endif @@ -8003,7 +8003,7 @@ } TARGET(LOAD_ATTR_METHOD_NO_DICT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_METHOD_NO_DICT; (void)(opcode); #endif @@ -8049,7 +8049,7 @@ } TARGET(LOAD_ATTR_METHOD_WITH_VALUES) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_METHOD_WITH_VALUES; (void)(opcode); #endif @@ -8117,7 +8117,7 @@ } TARGET(LOAD_ATTR_MODULE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_MODULE; (void)(opcode); #endif @@ -8196,7 +8196,7 @@ } TARGET(LOAD_ATTR_NONDESCRIPTOR_NO_DICT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_NONDESCRIPTOR_NO_DICT; (void)(opcode); #endif @@ -8243,7 +8243,7 @@ } TARGET(LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES; (void)(opcode); #endif @@ -8311,7 +8311,7 @@ } TARGET(LOAD_ATTR_PROPERTY) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_PROPERTY; (void)(opcode); #endif @@ -8406,7 +8406,7 @@ } TARGET(LOAD_ATTR_SLOT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_SLOT; (void)(opcode); #endif @@ -8474,7 +8474,7 @@ } TARGET(LOAD_ATTR_WITH_HINT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_ATTR_WITH_HINT; (void)(opcode); #endif @@ -8583,7 +8583,7 @@ } TARGET(LOAD_BUILD_CLASS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_BUILD_CLASS; (void)(opcode); #endif @@ -8613,7 +8613,7 @@ } TARGET(LOAD_COMMON_CONSTANT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_COMMON_CONSTANT; (void)(opcode); #endif @@ -8639,7 +8639,7 @@ } TARGET(LOAD_CONST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_CONST; (void)(opcode); #endif @@ -8676,7 +8676,7 @@ } TARGET(LOAD_CONST_IMMORTAL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_CONST_IMMORTAL; (void)(opcode); #endif @@ -8695,7 +8695,7 @@ } TARGET(LOAD_CONST_MORTAL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_CONST_MORTAL; (void)(opcode); #endif @@ -8713,7 +8713,7 @@ } TARGET(LOAD_DEREF) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_DEREF; (void)(opcode); #endif @@ -8737,7 +8737,7 @@ } TARGET(LOAD_FAST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_FAST; (void)(opcode); #endif @@ -8754,7 +8754,7 @@ } TARGET(LOAD_FAST_AND_CLEAR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_FAST_AND_CLEAR; (void)(opcode); #endif @@ -8771,7 +8771,7 @@ } TARGET(LOAD_FAST_CHECK) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_FAST_CHECK; (void)(opcode); #endif @@ -8797,7 +8797,7 @@ } TARGET(LOAD_FAST_LOAD_FAST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_FAST_LOAD_FAST; (void)(opcode); #endif @@ -8818,7 +8818,7 @@ } TARGET(LOAD_FROM_DICT_OR_DEREF) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_FROM_DICT_OR_DEREF; (void)(opcode); #endif @@ -8863,7 +8863,7 @@ } TARGET(LOAD_FROM_DICT_OR_GLOBALS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_FROM_DICT_OR_GLOBALS; (void)(opcode); #endif @@ -8943,7 +8943,7 @@ } TARGET(LOAD_GLOBAL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_GLOBAL; (void)(opcode); #endif @@ -8997,7 +8997,7 @@ } TARGET(LOAD_GLOBAL_BUILTIN) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_GLOBAL_BUILTIN; (void)(opcode); #endif @@ -9081,7 +9081,7 @@ } TARGET(LOAD_GLOBAL_MODULE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_GLOBAL_MODULE; (void)(opcode); #endif @@ -9149,7 +9149,7 @@ } TARGET(LOAD_LOCALS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_LOCALS; (void)(opcode); #endif @@ -9173,7 +9173,7 @@ } TARGET(LOAD_NAME) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_NAME; (void)(opcode); #endif @@ -9196,7 +9196,7 @@ } TARGET(LOAD_SMALL_INT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_SMALL_INT; (void)(opcode); #endif @@ -9214,7 +9214,7 @@ } TARGET(LOAD_SPECIAL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_SPECIAL; (void)(opcode); #endif @@ -9255,7 +9255,7 @@ } TARGET(LOAD_SUPER_ATTR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_SUPER_ATTR; (void)(opcode); #endif @@ -9392,7 +9392,7 @@ } TARGET(LOAD_SUPER_ATTR_ATTR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_SUPER_ATTR_ATTR; (void)(opcode); #endif @@ -9454,7 +9454,7 @@ } TARGET(LOAD_SUPER_ATTR_METHOD) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = LOAD_SUPER_ATTR_METHOD; (void)(opcode); #endif @@ -9534,7 +9534,7 @@ } TARGET(MAKE_CELL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = MAKE_CELL; (void)(opcode); #endif @@ -9557,7 +9557,7 @@ } TARGET(MAKE_FUNCTION) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = MAKE_FUNCTION; (void)(opcode); #endif @@ -9590,7 +9590,7 @@ } TARGET(MAP_ADD) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = MAP_ADD; (void)(opcode); #endif @@ -9623,7 +9623,7 @@ } TARGET(MATCH_CLASS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = MATCH_CLASS; (void)(opcode); #endif @@ -9678,7 +9678,7 @@ } TARGET(MATCH_KEYS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = MATCH_KEYS; (void)(opcode); #endif @@ -9706,7 +9706,7 @@ } TARGET(MATCH_MAPPING) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = MATCH_MAPPING; (void)(opcode); #endif @@ -9725,7 +9725,7 @@ } TARGET(MATCH_SEQUENCE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = MATCH_SEQUENCE; (void)(opcode); #endif @@ -9744,7 +9744,7 @@ } TARGET(NOP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = NOP; (void)(opcode); #endif @@ -9755,7 +9755,7 @@ } TARGET(NOT_TAKEN) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = NOT_TAKEN; (void)(opcode); #endif @@ -9766,7 +9766,7 @@ } TARGET(POP_EXCEPT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = POP_EXCEPT; (void)(opcode); #endif @@ -9787,7 +9787,7 @@ } TARGET(POP_ITER) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = POP_ITER; (void)(opcode); #endif @@ -9805,7 +9805,7 @@ } TARGET(POP_JUMP_IF_FALSE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = POP_JUMP_IF_FALSE; (void)(opcode); #endif @@ -9827,7 +9827,7 @@ } TARGET(POP_JUMP_IF_NONE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = POP_JUMP_IF_NONE; (void)(opcode); #endif @@ -9871,7 +9871,7 @@ } TARGET(POP_JUMP_IF_NOT_NONE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = POP_JUMP_IF_NOT_NONE; (void)(opcode); #endif @@ -9915,7 +9915,7 @@ } TARGET(POP_JUMP_IF_TRUE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = POP_JUMP_IF_TRUE; (void)(opcode); #endif @@ -9937,7 +9937,7 @@ } TARGET(POP_TOP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = POP_TOP; (void)(opcode); #endif @@ -9955,7 +9955,7 @@ } TARGET(PUSH_EXC_INFO) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = PUSH_EXC_INFO; (void)(opcode); #endif @@ -9984,7 +9984,7 @@ } TARGET(PUSH_NULL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = PUSH_NULL; (void)(opcode); #endif @@ -10000,7 +10000,7 @@ } TARGET(RAISE_VARARGS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = RAISE_VARARGS; (void)(opcode); #endif @@ -10029,7 +10029,7 @@ } TARGET(RERAISE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = RERAISE; (void)(opcode); #endif @@ -10070,7 +10070,7 @@ } TARGET(RESERVED) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = RESERVED; (void)(opcode); #endif @@ -10083,7 +10083,7 @@ } TARGET(RESUME) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = RESUME; (void)(opcode); #endif @@ -10159,7 +10159,7 @@ } TARGET(RESUME_CHECK) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = RESUME_CHECK; (void)(opcode); #endif @@ -10197,7 +10197,7 @@ } TARGET(RETURN_GENERATOR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = RETURN_GENERATOR; (void)(opcode); #endif @@ -10236,7 +10236,7 @@ } TARGET(RETURN_VALUE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = RETURN_VALUE; (void)(opcode); #endif @@ -10268,7 +10268,7 @@ } TARGET(SEND) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = SEND; (void)(opcode); #endif @@ -10372,7 +10372,7 @@ } TARGET(SEND_GEN) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = SEND_GEN; (void)(opcode); #endif @@ -10442,7 +10442,7 @@ } TARGET(SETUP_ANNOTATIONS) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = SETUP_ANNOTATIONS; (void)(opcode); #endif @@ -10489,7 +10489,7 @@ } TARGET(SET_ADD) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = SET_ADD; (void)(opcode); #endif @@ -10516,7 +10516,7 @@ } TARGET(SET_FUNCTION_ATTRIBUTE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = SET_FUNCTION_ATTRIBUTE; (void)(opcode); #endif @@ -10544,7 +10544,7 @@ } TARGET(SET_UPDATE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = SET_UPDATE; (void)(opcode); #endif @@ -10571,7 +10571,7 @@ } TARGET(STORE_ATTR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_ATTR; (void)(opcode); #endif @@ -10628,7 +10628,7 @@ } TARGET(STORE_ATTR_INSTANCE_VALUE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_ATTR_INSTANCE_VALUE; (void)(opcode); #endif @@ -10704,7 +10704,7 @@ } TARGET(STORE_ATTR_SLOT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_ATTR_SLOT; (void)(opcode); #endif @@ -10755,7 +10755,7 @@ } TARGET(STORE_ATTR_WITH_HINT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_ATTR_WITH_HINT; (void)(opcode); #endif @@ -10855,7 +10855,7 @@ } TARGET(STORE_DEREF) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_DEREF; (void)(opcode); #endif @@ -10874,7 +10874,7 @@ } TARGET(STORE_FAST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_FAST; (void)(opcode); #endif @@ -10894,7 +10894,7 @@ } TARGET(STORE_FAST_LOAD_FAST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_FAST_LOAD_FAST; (void)(opcode); #endif @@ -10917,7 +10917,7 @@ } TARGET(STORE_FAST_STORE_FAST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_FAST_STORE_FAST; (void)(opcode); #endif @@ -10948,7 +10948,7 @@ } TARGET(STORE_GLOBAL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_GLOBAL; (void)(opcode); #endif @@ -10973,7 +10973,7 @@ } TARGET(STORE_NAME) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_NAME; (void)(opcode); #endif @@ -11019,7 +11019,7 @@ } TARGET(STORE_SLICE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_SLICE; (void)(opcode); #endif @@ -11083,7 +11083,7 @@ } TARGET(STORE_SUBSCR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_SUBSCR; (void)(opcode); #endif @@ -11143,7 +11143,7 @@ } TARGET(STORE_SUBSCR_DICT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_SUBSCR_DICT; (void)(opcode); #endif @@ -11184,7 +11184,7 @@ } TARGET(STORE_SUBSCR_LIST_INT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = STORE_SUBSCR_LIST_INT; (void)(opcode); #endif @@ -11250,7 +11250,7 @@ } TARGET(SWAP) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = SWAP; (void)(opcode); #endif @@ -11269,7 +11269,7 @@ } TARGET(TO_BOOL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = TO_BOOL; (void)(opcode); #endif @@ -11321,7 +11321,7 @@ } TARGET(TO_BOOL_ALWAYS_TRUE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = TO_BOOL_ALWAYS_TRUE; (void)(opcode); #endif @@ -11364,7 +11364,7 @@ } TARGET(TO_BOOL_BOOL) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = TO_BOOL_BOOL; (void)(opcode); #endif @@ -11388,7 +11388,7 @@ } TARGET(TO_BOOL_INT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = TO_BOOL_INT; (void)(opcode); #endif @@ -11429,7 +11429,7 @@ } TARGET(TO_BOOL_LIST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = TO_BOOL_LIST; (void)(opcode); #endif @@ -11463,7 +11463,7 @@ } TARGET(TO_BOOL_NONE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = TO_BOOL_NONE; (void)(opcode); #endif @@ -11491,7 +11491,7 @@ } TARGET(TO_BOOL_STR) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = TO_BOOL_STR; (void)(opcode); #endif @@ -11533,7 +11533,7 @@ } TARGET(UNARY_INVERT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = UNARY_INVERT; (void)(opcode); #endif @@ -11562,7 +11562,7 @@ } TARGET(UNARY_NEGATIVE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = UNARY_NEGATIVE; (void)(opcode); #endif @@ -11591,7 +11591,7 @@ } TARGET(UNARY_NOT) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = UNARY_NOT; (void)(opcode); #endif @@ -11609,7 +11609,7 @@ } TARGET(UNPACK_EX) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = UNPACK_EX; (void)(opcode); #endif @@ -11636,7 +11636,7 @@ } TARGET(UNPACK_SEQUENCE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = UNPACK_SEQUENCE; (void)(opcode); #endif @@ -11687,7 +11687,7 @@ } TARGET(UNPACK_SEQUENCE_LIST) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = UNPACK_SEQUENCE_LIST; (void)(opcode); #endif @@ -11738,7 +11738,7 @@ } TARGET(UNPACK_SEQUENCE_TUPLE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = UNPACK_SEQUENCE_TUPLE; (void)(opcode); #endif @@ -11780,7 +11780,7 @@ } TARGET(UNPACK_SEQUENCE_TWO_TUPLE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = UNPACK_SEQUENCE_TWO_TUPLE; (void)(opcode); #endif @@ -11821,7 +11821,7 @@ } TARGET(WITH_EXCEPT_START) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = WITH_EXCEPT_START; (void)(opcode); #endif @@ -11879,7 +11879,7 @@ } TARGET(YIELD_VALUE) { - #if defined(Py_TAIL_CALL_INTERP) + #if Py_TAIL_CALL_INTERP int opcode = YIELD_VALUE; (void)(opcode); #endif @@ -12061,7 +12061,7 @@ JUMP_TO_LABEL(error); } #endif stack_pointer = _PyFrame_GetStackPointer(frame); - #ifdef Py_TAIL_CALL_INTERP + #if Py_TAIL_CALL_INTERP int opcode; #endif DISPATCH(); @@ -12109,7 +12109,7 @@ JUMP_TO_LABEL(error); assert(!_PyErr_Occurred(tstate)); #endif stack_pointer = _PyFrame_GetStackPointer(frame); - #ifdef Py_TAIL_CALL_INTERP + #if Py_TAIL_CALL_INTERP int opcode; #endif DISPATCH(); diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h index 039a6eee379..142fbc33641 100644 --- a/Python/opcode_targets.h +++ b/Python/opcode_targets.h @@ -1,4 +1,4 @@ -#ifndef Py_TAIL_CALL_INTERP +#if !Py_TAIL_CALL_INTERP static void *opcode_targets[256] = { &&TARGET_CACHE, &&TARGET_BINARY_SLICE, diff --git a/Tools/cases_generator/target_generator.py b/Tools/cases_generator/target_generator.py index db028116db9..ca151ff640a 100644 --- a/Tools/cases_generator/target_generator.py +++ b/Tools/cases_generator/target_generator.py @@ -26,7 +26,7 @@ def write_opcode_targets(analysis: Analysis, out: CWriter) -> None: for name, op in analysis.opmap.items(): if op < 256: targets[op] = f"&&TARGET_{name},\n" - out.emit("#ifndef Py_TAIL_CALL_INTERP\n") + out.emit("#if !Py_TAIL_CALL_INTERP\n") out.emit("static void *opcode_targets[256] = {\n") for target in targets: out.emit(target) diff --git a/Tools/cases_generator/tier1_generator.py b/Tools/cases_generator/tier1_generator.py index 02012fb4172..dd9faa3587e 100644 --- a/Tools/cases_generator/tier1_generator.py +++ b/Tools/cases_generator/tier1_generator.py @@ -229,7 +229,7 @@ def generate_tier1_cases( out.emit(f"TARGET({name}) {{\n") # We need to ifdef it because this breaks platforms # without computed gotos/tail calling. - out.emit(f"#if defined(Py_TAIL_CALL_INTERP)\n") + out.emit(f"#if Py_TAIL_CALL_INTERP\n") out.emit(f"int opcode = {name};\n") out.emit(f"(void)(opcode);\n") out.emit(f"#endif\n")