Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile.pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix high stack consumption in Python's interpreter loop on Clang 22 by setting function limits for inlining.
47 changes: 47 additions & 0 deletions configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -7244,6 +7244,34 @@ 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([[
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.
Comment on lines +7250 to +7253
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reformat to 80 columns and minor cleanup:

Suggested change
// 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.
// See gh-148284: Clang 22 seems to have interactions with inlining
// and the stackref buffer which cause 40 kB of stack usage on x86-64
// in buggy versions of _PyEval_EvalFrameDefault() in computed goto
// interpreter. The normal usage seen is normally 1-2 kB.

#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.
Comment on lines +7267 to +7268
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest adding "Suppress inlining of functions whose stack size exceeds 512 bytes." to explain the purpose of this option:

Suggested change
// This number should be tuned to follow the C stack consumption
// in _PyEval_EvalFrameDefault on computed goto interpreter.
// gh-148284: Suppress inlining of functions whose stack size exceeds
// 512 bytes. This number should be tuned to follow the C stack
// consumption in _PyEval_EvalFrameDefault() on computed goto
// interpreter.

The Clang option is documented at: https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-finline-max-stacksize

CFLAGS_CEVAL="-finline-max-stacksize=512"
else
CFLAGS_CEVAL=""
fi
AC_SUBST([CFLAGS_CEVAL])
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a way to make this a private variable? I don't feel good exposing it for now.


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
Expand Down
Loading