From 012b8a9f17464341f5daf09a578a025d7d3f7599 Mon Sep 17 00:00:00 2001
From: Ken Jin <kenjin4096@gmail.com>
Date: Fri, 10 Apr 2026 16:41:00 +0800
Subject: [PATCH 1/3] Block inlining of gigantic functions

---
 Makefile.pre.in |  5 +++++
 configure       | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac    | 29 +++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 80a1b590c2f9b8..797a6d6cceece0 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -126,6 +126,8 @@ PY_CORE_CFLAGS=	$(PY_STDMODULE_CFLAGS) -DPy_BUILD_CORE
 PY_CORE_LDFLAGS=$(PY_LDFLAGS) $(PY_LDFLAGS_NODIST)
 # Strict or non-strict aliasing flags used to compile dtoa.c, see above
 CFLAGS_ALIASING=@CFLAGS_ALIASING@
+# Compilation flags only for ceval.c.
+CFLAGS_CEVAL=@CFLAGS_CEVAL@
 
 
 # Machine-dependent subdirectories
@@ -3142,6 +3144,9 @@ regen-jit:
 Python/dtoa.o: Python/dtoa.c
 	$(CC) -c $(PY_CORE_CFLAGS) $(CFLAGS_ALIASING) -o $@ $<
 
+Python/ceval.o: Python/ceval.c
+	$(CC) -c $(PY_CORE_CFLAGS) $(CFLAGS_CEVAL) -o $@ $<
+
 # Run reindent on the library
 .PHONY: reindent
 reindent:
diff --git a/configure b/configure
index 8cfdda5a29b00d..2c01316e657653 100755
--- a/configure
+++ b/configure
@@ -826,6 +826,7 @@ OPENSSL_LDFLAGS
 OPENSSL_LIBS
 OPENSSL_INCLUDES
 ENSUREPIP
+CFLAGS_CEVAL
 SRCDIRS
 THREADHEADERS
 PANEL_LIBS
@@ -30049,6 +30050,53 @@ printf "%s\n" "#define HAVE_GLIBC_MEMMOVE_BUG 1" >>confdefs.h
 
 fi
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we need to manually block large inlining in ceval.c" >&5
+printf %s "checking if we need to manually block large inlining in ceval.c... " >&6; }
+if test "$cross_compiling" = yes
+then :
+  block_huge_inlining_in_ceval=undefined
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+void foo(void *p, void *q) { memmove(p, q, 19); }
+int main(void) {
+// See gh-148284:
+// Clang 22 seems to have interactions with inlining and the stackref buffer
+// which cause 40kB of stack usage on x86-64 in buggy versions of _PyEval_EvalFrameDefault
+// in computed goto interpreter. The normal usage seen is normally 1-2kB.
+#if defined(__clang__) && (__clang_major__ == 22)
+    return 1;
+#else
+    return 0;
+#endif
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  block_huge_inlining_in_ceval=no
+else case e in #(
+  e) block_huge_inlining_in_ceval=yes ;;
+esac
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $block_huge_inlining_in_ceval" >&5
+printf "%s\n" "$block_huge_inlining_in_ceval" >&6; }
+
+if test "$block_huge_inlining_in_ceval" = yes && test "$ac_cv_computed_gotos" = yes; then
+    // This number should be tuned to follow the C stack consumption
+    // in _PyEval_EvalFrameDefault on computed goto interpreter.
+    CFLAGS_CEVAL="-finline-max-stacksize=512"
+else
+    CFLAGS_CEVAL=""
+fi
+
+
 if test "$ac_cv_gcc_asm_for_x87" = yes; then
     # Some versions of gcc miscompile inline asm:
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491
diff --git a/configure.ac b/configure.ac
index 1acb91fd27b9d2..4b424dba8b7906 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7244,6 +7244,35 @@ if test "$have_glibc_memmove_bug" = yes; then
      for memmove and bcopy.])
 fi
 
+AC_MSG_CHECKING([if we need to manually block large inlining in ceval.c])
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
+void foo(void *p, void *q) { memmove(p, q, 19); }
+int main(void) {
+// See gh-148284:
+// Clang 22 seems to have interactions with inlining and the stackref buffer
+// which cause 40kB of stack usage on x86-64 in buggy versions of _PyEval_EvalFrameDefault
+// in computed goto interpreter. The normal usage seen is normally 1-2kB.
+#if defined(__clang__) && (__clang_major__ == 22)
+    return 1;
+#else
+    return 0;
+#endif
+}
+]])],
+[block_huge_inlining_in_ceval=no],
+[block_huge_inlining_in_ceval=yes],
+[block_huge_inlining_in_ceval=undefined])
+AC_MSG_RESULT([$block_huge_inlining_in_ceval])
+
+if test "$block_huge_inlining_in_ceval" = yes && test "$ac_cv_computed_gotos" = yes; then
+    // This number should be tuned to follow the C stack consumption
+    // in _PyEval_EvalFrameDefault on computed goto interpreter.
+    CFLAGS_CEVAL="-finline-max-stacksize=512"
+else
+    CFLAGS_CEVAL=""
+fi
+AC_SUBST([CFLAGS_CEVAL])
+
 if test "$ac_cv_gcc_asm_for_x87" = yes; then
     # Some versions of gcc miscompile inline asm:
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491

From 144522b253bed817b51ea0065a8900212c061167 Mon Sep 17 00:00:00 2001
From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 09:21:49 +0000
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?=
 =?UTF-8?q?rb=5Fit.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../2026-04-10-09-21-40.gh-issue-148284.6xMH49.rst               | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2026-04-10-09-21-40.gh-issue-148284.6xMH49.rst

diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-04-10-09-21-40.gh-issue-148284.6xMH49.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-04-10-09-21-40.gh-issue-148284.6xMH49.rst
new file mode 100644
index 00000000000000..5453f15f67e3d0
--- /dev/null
+++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-04-10-09-21-40.gh-issue-148284.6xMH49.rst
@@ -0,0 +1 @@
+Fix high stack consumption in Python's interpreter loop on Clang 22 by setting function limits for inlining.

From 9e14d47a9b1c4a13925968c49e98a755e14a3ec7 Mon Sep 17 00:00:00 2001
From: Ken Jin <kenjin4096@gmail.com>
Date: Fri, 10 Apr 2026 17:30:40 +0800
Subject: [PATCH 3/3] remove unused function

---
 configure    | 1 -
 configure.ac | 1 -
 2 files changed, 2 deletions(-)

diff --git a/configure b/configure
index 2c01316e657653..35e40f433f4bcc 100755
--- a/configure
+++ b/configure
@@ -30059,7 +30059,6 @@ else case e in #(
   e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-void foo(void *p, void *q) { memmove(p, q, 19); }
 int main(void) {
 // See gh-148284:
 // Clang 22 seems to have interactions with inlining and the stackref buffer
diff --git a/configure.ac b/configure.ac
index 4b424dba8b7906..2d9dfd7cf0d889 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7246,7 +7246,6 @@ fi
 
 AC_MSG_CHECKING([if we need to manually block large inlining in ceval.c])
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
-void foo(void *p, void *q) { memmove(p, q, 19); }
 int main(void) {
 // See gh-148284:
 // Clang 22 seems to have interactions with inlining and the stackref buffer