Skip to content

Commit 944072e

Browse files
committed
fixup! gh-101525: Check whether to skip functions with computed gotos during BOLT runs
Address review comments
1 parent 33effce commit 944072e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

configure.ac

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,7 +2148,7 @@ if test "$Py_BOLT" = 'true' ; then
21482148
esac
21492149
AC_MSG_RESULT([$has_packed_relocs])
21502150

2151-
# Check BOLT version to determine if we need to skip functions with computed gotos.
2151+
# Check BOLT version if it's < 21.1.0, to determine if we need to skip functions with computed gotos.
21522152
AC_MSG_CHECKING([llvm-bolt version])
21532153
llvm_bolt_version=$("${LLVM_BOLT}" --version 2>/dev/null | grep -oE '[[0-9]]+\.[[0-9]]+\.[[0-9]]+' | head -1)
21542154
AC_MSG_RESULT([${llvm_bolt_version}])
@@ -2204,7 +2204,7 @@ then
22042204
dnl Skip base computed goto functions
22052205
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS} -skip-funcs=_PyEval_EvalFrameDefault,sre_ucs1_match/1,sre_ucs2_match/1,sre_ucs4_match/1"
22062206
dnl GCC's LTO creates .lto_priv.0 clones that also need to be skipped
2207-
dnl Skip if packed relocs not present
2207+
dnl Skip if packed relocs not present.
22082208
if test "${has_packed_relocs}" != "yes" && test "${ac_cv_cc_name}" = "gcc" && test "${with_lto}" != "no" && test -n "${with_lto}"; then
22092209
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS},sre_ucs1_match.lto_priv.0/1,sre_ucs2_match.lto_priv.0/1,sre_ucs4_match.lto_priv.0/1"
22102210
fi
@@ -2227,7 +2227,7 @@ then
22272227
bolt_need_lto=$( (test "${with_lto}" != "no" && test -n "${with_lto}") && echo "yes" || echo "no")
22282228
bolt_need_pgo=$( (test "${enable_optimizations}" = "yes" && test "${enable_shared}" = "yes") && echo "yes" || echo "no")
22292229

2230-
dnl Build the skip list
2230+
dnl Build the skip list $bolt_skip_list
22312231
test "${bolt_need_base}" = "yes" && bolt_skip_list="${bolt_base}"
22322232
if test "${bolt_need_lto}" = "yes"; then
22332233
if test "${enable_shared}" = "yes"; then
@@ -2250,7 +2250,7 @@ then
22502250
fi
22512251
fi
22522252

2253-
dnl Apply the skip list
2253+
dnl Apply the skip list to BOLT_COMMON_FLAGS
22542254
if test -n "${bolt_skip_list}"; then
22552255
if test "${bolt_need_skip_computed_goto}" = "yes"; then
22562256
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS},${bolt_skip_list}"

0 commit comments

Comments
 (0)