gh-129989: Properly disable tailcall interp in configure (GH-129991)

Co-authored-by: Zanie Blue <[email protected]>
python · Feb 15, 2025 · 359c7dd · 359c7dd
1 parent c26bed1
commit 359c7dd
Show file tree

Hide file tree

Showing 9 changed files with 287 additions and 286 deletions.
diff --git a/Lib/test/test_generated_cases.py b/Lib/test/test_generated_cases.py
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
@@ -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
@@ -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
@@ -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
@@ -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))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix a bug where the tailcall interpreter was enabled when ``--without-tail-call-interp`` was provided to the configure script.