Skip to content
Merged
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
25 changes: 19 additions & 6 deletions Lib/test/support/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import _opcode
import os
import re
import shlex
import stat
import sys
import sysconfig
Expand Down Expand Up @@ -469,27 +470,39 @@ def check_sanitizer(*, address=False, hwaddress=False, memory=False, ub=False,


cflags = sysconfig.get_config_var('CFLAGS') or ''
config_args = sysconfig.get_config_var('CONFIG_ARGS') or ''
config_args = shlex.split(sysconfig.get_config_var('CONFIG_ARGS') or '')

def configured_with_sanitizer(name):
with_option = f'--with-{name}-sanitizer'
without_option = f'--without-{name}-sanitizer'
enabled = False
for arg in config_args:
if arg == without_option or arg == f'{with_option}=no':
enabled = False
elif arg == with_option or arg.startswith(f'{with_option}='):
enabled = True
return enabled

memory_sanitizer = (
'-fsanitize=memory' in cflags or
'--with-memory-sanitizer' in config_args
configured_with_sanitizer('memory')
)
hwaddress_sanitizer = (
'-fsanitize=hwaddress' in cflags or
'--with-hwaddress-sanitizer' in config_args
configured_with_sanitizer('hwaddress')
)
address_sanitizer = (
'-fsanitize=address' in cflags or
'--with-address-sanitizer' in config_args or
configured_with_sanitizer('address') or
hwaddress_sanitizer
)
ub_sanitizer = (
'-fsanitize=undefined' in cflags or
'--with-undefined-behavior-sanitizer' in config_args
configured_with_sanitizer('undefined-behavior')
)
thread_sanitizer = (
'-fsanitize=thread' in cflags or
'--with-thread-sanitizer' in config_args
configured_with_sanitizer('thread')
)
function_sanitizer = (
'-fsanitize=function' in cflags
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix the :samp:`--with-{name}-sanitizer=no` and :samp:`--without-{name}-sanitizer`
:program:`configure` options enabling the sanitizer instead of disabling it.
106 changes: 67 additions & 39 deletions configure

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

46 changes: 22 additions & 24 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3746,17 +3746,17 @@ AC_MSG_CHECKING([for --with-address-sanitizer])
AC_ARG_WITH([address_sanitizer],
AS_HELP_STRING([--with-address-sanitizer],
[enable AddressSanitizer memory error detector, 'asan' (default is no)]),
[
AC_MSG_RESULT([$withval])
[], [with_address_sanitizer=no])
AC_MSG_RESULT([$with_address_sanitizer])
AS_VAR_IF([with_address_sanitizer], [no], [], [
BASECFLAGS="-fsanitize=address -fno-omit-frame-pointer $BASECFLAGS"
LDFLAGS="-fsanitize=address $LDFLAGS"
AC_MSG_CHECKING([whether a program links with -fsanitize=address])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([cannot link with -fsanitize=address: the compiler does not support AddressSanitizer or its runtime library is not installed; see config.log])])
],
[AC_MSG_RESULT([no])])
])

AC_MSG_CHECKING([for --with-hwaddress-sanitizer])
AC_ARG_WITH(
Expand All @@ -3765,8 +3765,9 @@ AC_ARG_WITH(
[--with-hwaddress-sanitizer],
[enable HWAddressSanitizer memory error detector, 'hwasan' (default is no)]
)],
[
AC_MSG_RESULT([$withval])
[], [with_hwaddress_sanitizer=no])
AC_MSG_RESULT([$with_hwaddress_sanitizer])
AS_VAR_IF([with_hwaddress_sanitizer], [no], [], [
hwasan_flags="-fsanitize=hwaddress"
# x86-64 lacks address tagging, so HWASan needs the page aliasing mode there.
# See gh-156049 and
Expand All @@ -3781,8 +3782,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([cannot link with $hwasan_flags: the compiler does not support HWAddressSanitizer or its runtime library is not installed; see config.log])])
],
[AC_MSG_RESULT([no])])
])

AC_MSG_CHECKING([for --with-memory-sanitizer])
AC_ARG_WITH(
Expand All @@ -3791,17 +3791,17 @@ AC_ARG_WITH(
[--with-memory-sanitizer],
[enable MemorySanitizer allocation error detector, 'msan' (default is no)]
)],
[
AC_MSG_RESULT([$withval])
[], [with_memory_sanitizer=no])
AC_MSG_RESULT([$with_memory_sanitizer])
AS_VAR_IF([with_memory_sanitizer], [no], [], [
BASECFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer $BASECFLAGS"
LDFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 $LDFLAGS"
AC_MSG_CHECKING([whether a program links with -fsanitize=memory])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([cannot link with -fsanitize=memory: the compiler does not support MemorySanitizer or its runtime library is not installed; see config.log])])
],
[AC_MSG_RESULT([no])])
])

AC_MSG_CHECKING([for --with-undefined-behavior-sanitizer])
AC_ARG_WITH(
Expand All @@ -3810,8 +3810,11 @@ AC_ARG_WITH(
[--with-undefined-behavior-sanitizer],
[enable UndefinedBehaviorSanitizer undefined behaviour detector, 'ubsan' (default is no)]
)],
[
AC_MSG_RESULT([$withval])
[], [with_undefined_behavior_sanitizer=no])
AC_MSG_RESULT([$with_undefined_behavior_sanitizer])
AS_VAR_IF([with_undefined_behavior_sanitizer], [no], [
with_ubsan="no"
], [
BASECFLAGS="-fsanitize=undefined $BASECFLAGS"
LDFLAGS="-fsanitize=undefined $LDFLAGS"
with_ubsan="yes"
Expand All @@ -3820,10 +3823,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([cannot link with -fsanitize=undefined: the compiler does not support UndefinedBehaviorSanitizer or its runtime library is not installed; see config.log])])
],
[
AC_MSG_RESULT([no])
with_ubsan="no"
])

AC_MSG_CHECKING([for --with-thread-sanitizer])
Expand All @@ -3833,8 +3832,11 @@ AC_ARG_WITH(
[--with-thread-sanitizer],
[enable ThreadSanitizer data race detector, 'tsan' (default is no)]
)],
[
AC_MSG_RESULT([$withval])
[], [with_thread_sanitizer=no])
AC_MSG_RESULT([$with_thread_sanitizer])
AS_VAR_IF([with_thread_sanitizer], [no], [
with_tsan="no"
], [
BASECFLAGS="-fsanitize=thread $BASECFLAGS"
LDFLAGS="-fsanitize=thread $LDFLAGS"
with_tsan="yes"
Expand All @@ -3843,10 +3845,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([cannot link with -fsanitize=thread: the compiler does not support ThreadSanitizer or its runtime library is not installed; see config.log])])
],
[
AC_MSG_RESULT([no])
with_tsan="no"
])

# Set info about shared libraries.
Expand Down
Loading