Merge branch 'main' into python#129912

isatyamks · web-flow · commit ae5e64e4af79 · 2025-02-12T23:50:47.000+05:30
diff --git a/Misc/NEWS.d/next/Build/2025-02-11-08-06-44.gh-issue-129819.7rn4dY.rst b/Misc/NEWS.d/next/Build/2025-02-11-08-06-44.gh-issue-129819.7rn4dY.rst
@@ -0,0 +1 @@
+Allow building the JIT with the tailcall interpreter.
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-02-11-22-20-21.gh-issue-129715.mopO8n.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-02-11-22-20-21.gh-issue-129715.mopO8n.rst
@@ -0,0 +1 @@
+Improve the experimental JIT's handling of returns to unknown callers.
diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
@@ -397,7 +397,7 @@ do {                                                   \
     stack_pointer = _PyFrame_GetStackPointer(frame);   \
     if (next_instr == NULL) {                          \
         next_instr = frame->instr_ptr;                 \
-        goto error;                                    \
+        JUMP_TO_LABEL(error);                          \
     }                                                  \
     DISPATCH();                                        \
 } while (0)
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -185,8 +185,7 @@ is_instrumented(int opcode)
 {
     assert(opcode != 0);
     assert(opcode != RESERVED);
-    assert(opcode != ENTER_EXECUTOR);
-    return opcode >= MIN_INSTRUMENTED_OPCODE;
+    return opcode != ENTER_EXECUTOR && opcode >= MIN_INSTRUMENTED_OPCODE;
 }
 
 #ifndef NDEBUG
diff --git a/Python/optimizer.c b/Python/optimizer.c
@@ -671,7 +671,7 @@ translate_bytecode_to_trace(
                         if (trace_stack_depth == 0) {
                             DPRINTF(2, "Trace stack underflow\n");
                             OPT_STAT_INC(trace_stack_underflow);
-                            goto done;
+                            return 0;
                         }
                     }
                     uint32_t orig_oparg = oparg;  // For OPARG_TOP/BOTTOM
diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -7033,19 +7033,6 @@ fi
 ],
 [AC_MSG_RESULT([no value specified])])
 
-# Do not enable tail-calling interpreter if tier 2 is enabled.
-AS_VAR_IF(
-  [tier2_flags],
-  [],
-  [
-    case "$ac_cv_tail_call" in yes*)
-      AC_DEFINE([Py_TAIL_CALL_INTERP], [1],
-      [Define if the C compiler supports efficient proper tail calls.])
-    esac
-  ],
-  []
-)
-
 
 case $ac_sys_system in
 AIX*)
diff --git a/pyconfig.h.in b/pyconfig.h.in
@@ -1718,7 +1718,7 @@
 /* The version of SunOS/Solaris as reported by `uname -r' without the dot. */
 #undef Py_SUNOS_VERSION
 
-/* Define if the C compiler supports efficient proper tail calls. */
+/* Define if you want to use tail-calling interpreters in CPython. */
 #undef Py_TAIL_CALL_INTERP
 
 /* Define if you want to enable tracing references for debugging purpose */

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Allow building the JIT with the tailcall interpreter.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Improve the experimental JIT's handling of returns to unknown callers.`
Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,7 @@ is_instrumented(int opcode)`
`185`	`185`	`{`
`186`	`186`	`assert(opcode != 0);`
`187`	`187`	`assert(opcode != RESERVED);`
`188`		`- assert(opcode != ENTER_EXECUTOR);`
`189`		`- return opcode >= MIN_INSTRUMENTED_OPCODE;`
	`188`	`+ return opcode != ENTER_EXECUTOR && opcode >= MIN_INSTRUMENTED_OPCODE;`
`190`	`189`	`}`
`191`	`190`
`192`	`191`	`#ifndef NDEBUG`
Original file line number	Diff line number	Diff line change
`@@ -671,7 +671,7 @@ translate_bytecode_to_trace(`
`671`	`671`	`if (trace_stack_depth == 0) {`
`672`	`672`	`DPRINTF(2, "Trace stack underflow\n");`
`673`	`673`	`OPT_STAT_INC(trace_stack_underflow);`
`674`		`- goto done;`
	`674`	`+ return 0;`
`675`	`675`	`}`
`676`	`676`	`}`
`677`	`677`	`uint32_t orig_oparg = oparg; // For OPARG_TOP/BOTTOM`