Partial GCC 15.0 support

Author: Fidget-Spinner

Python/bytecodes.c

@@ -1056,7 +1056,7 @@ dummy_func(
             if (err) {
                 assert(oparg == 0);
                 monitor_reraise(tstate, frame, this_instr);
-                CEVAL_GOTO(exception_unwind);
+                goto exception_unwind;
             }
             ERROR_IF(true, error);
         }
@@ -1326,7 +1326,7 @@ dummy_func(
             assert(exc && PyExceptionInstance_Check(exc));
             _PyErr_SetRaisedException(tstate, exc);
             monitor_reraise(tstate, frame, this_instr);
-            CEVAL_GOTO(exception_unwind);
+            goto exception_unwind;
         }
 
         tier1 inst(END_ASYNC_FOR, (awaitable_st, exc_st -- )) {
@@ -1342,7 +1342,7 @@ dummy_func(
                 _PyErr_SetRaisedException(tstate, exc);
                 monitor_reraise(tstate, frame, this_instr);
                 INPUTS_DEAD();
-                CEVAL_GOTO(exception_unwind);
+                goto exception_unwind;
             }
         }
 
@@ -1365,7 +1365,7 @@ dummy_func(
                 INPUTS_DEAD();
                 none = PyStackRef_NULL;
                 value = PyStackRef_NULL;
-                CEVAL_GOTO(exception_unwind);
+                goto exception_unwind;
             }
         }
 
@@ -4046,7 +4046,7 @@ dummy_func(
             PyObject *res_o = PyLong_FromSsize_t(len_i);
             assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
             if (res_o == NULL) {
-                CEVAL_GOTO(error);
+                goto error;
             }
             PyStackRef_CLOSE(arg_stackref);
             DEAD(args);
@@ -4785,7 +4785,7 @@ dummy_func(
                         tstate, frame, this_instr, prev_instr);
                 if (original_opcode < 0) {
                     next_instr = this_instr+1;
-                    CEVAL_GOTO(error);
+                    goto error;
                 }
                 next_instr = frame->instr_ptr;
                 if (next_instr != this_instr) {

Python/ceval_macros.h

@@ -79,27 +79,26 @@
 #endif
 
 #ifdef Py_TAIL_CALL_INTERP
-#   define Py_MUSTTAIL __attribute__((musttail))
+    // 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))
     Py_PRESERVE_NONE_CC
     typedef PyObject* (*py_tail_call_funcptr)(TAIL_CALL_PARAMS);
 #   define DISPATCH_GOTO() do { \
     Py_MUSTTAIL \
     return (INSTRUCTION_TABLE[opcode])(TAIL_CALL_ARGS); \
 } while (0)
-#   define CEVAL_GOTO(name) do { \
+#   define TAIL_CALL(name) do { \
     Py_MUSTTAIL \
     return (_TAIL_CALL_##name)(TAIL_CALL_ARGS); \
 } while (0)
 
 #elif USE_COMPUTED_GOTOS
 #  define TARGET(op) TARGET_##op:
 #  define DISPATCH_GOTO() goto *opcode_targets[opcode]
-#  define CEVAL_GOTO(name) goto name;
 #else
 #  define TARGET(op) case op: TARGET_##op:
 #  define DISPATCH_GOTO() goto dispatch_opcode
-#  define CEVAL_GOTO(name) goto name;
 #endif
 
 #define TAIL_CALL_TARGET(name) name
@@ -118,7 +117,7 @@
 do { \
     lltrace = maybe_lltrace_resume_frame(frame, GLOBALS()); \
     if (lltrace < 0) { \
-        CEVAL_GOTO(exit_unwind); \
+        goto exit_unwind; \
     } \
 } while (0)
 #else
@@ -158,13 +157,13 @@ do { \
         frame = tstate->current_frame = (NEW_FRAME); \
         CALL_STAT_INC(inlined_py_calls); \
         if (_Py_EnterRecursivePy(tstate)) {\
-            CEVAL_GOTO(exit_unwind);\
+            goto exit_unwind;\
         } \
         next_instr = frame->instr_ptr; \
         stack_pointer = _PyFrame_GetStackPointer(frame); \
         lltrace = maybe_lltrace_resume_frame(frame, GLOBALS()); \
         if (lltrace < 0) { \
-            CEVAL_GOTO(exit_unwind); \
+            goto exit_unwind; \
         } \
         NEXTOPARG(); \
         DISPATCH_GOTO(); \
@@ -178,7 +177,7 @@ do { \
         frame = tstate->current_frame = (NEW_FRAME); \
         CALL_STAT_INC(inlined_py_calls); \
         if (_Py_EnterRecursivePy(tstate)) { \
-            CEVAL_GOTO(exit_unwind); \
+            goto exit_unwind; \
         } \
         next_instr = frame->instr_ptr; \
         stack_pointer = _PyFrame_GetStackPointer(frame); \
@@ -447,7 +446,7 @@ do { \
         stack_pointer = _PyFrame_GetStackPointer(frame); \
         if (next_instr == NULL) { \
             next_instr = (dest)+1; \
-            CEVAL_GOTO(error); \
+            goto error; \
         } \
     } \
 } while (0);
@@ -491,7 +490,7 @@ do {                                                   \
     tstate->previous_executor = NULL;                  \
     frame = tstate->current_frame;                     \
     if (next_instr == NULL) {                          \
-        CEVAL_GOTO(resume_with_error);                        \
+        goto resume_with_error;                        \
     }                                                  \
     stack_pointer = _PyFrame_GetStackPointer(frame);   \
     DISPATCH();                                        \