From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by sourceware.org (Postfix) with ESMTPS id 70D8D38582B2 for ; Fri, 24 Nov 2023 08:11:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 70D8D38582B2 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 70D8D38582B2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::12e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700813472; cv=none; b=AzenEyZh1fFmr0cHfqrFMgv8VBj6EuUCG0YhA/LyMiH5lYw57lCp0DJGq6NoUj9vwmEqGXURtfvv/NusSqsyarjwizKShLBq3k9R935CxtOwAUnZvN+kVuO/c7GWsJ5cf9AALvKyr8Hbp87RF4X/UsF20t7MU+UxfUPXGWb8uls= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700813472; c=relaxed/simple; bh=yFC8FNLCNx0hfQcL8mqfECXBulyTJzmzp//XKIvbvZw=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=LKvxCbX3Ud3n74U0OLZRpXbUQrNGFbJ0sKL2rgUste2RwpsmHqPgfo+jg1N3iZjtmiHYih2zGbUhwfiqbwjNiX5+N9/enQZMu7hvb9Au5/2Ua8BIna7Zbp7zluJpUbGPk9kzJAJ7OqbEPzldMx1D+QIXbohHXaWOysQMxXz8n/Q= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-50a6ff9881fso2446537e87.1 for ; Fri, 24 Nov 2023 00:11:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700813468; x=1701418268; darn=gcc.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=GLckDeXgV5HnWG39Vw4RNeMhUIPz/ZuOKSa/29ctzjo=; b=TmIzV9aeYCPIb3qhnkcEevUgVZ6SfECx7CVp695/4C5HbCFjcy6hktqhQfSmHyWCeU fT8/diNDGOI4cKA8dmNRKwD/LQ8w8e0kIe0FSOY4zvvVITTWe7VhYI+k6/VwxkFYzori p2uCaQUQa2im8F0RX9NNNyGphB15VmB6UGU7R9QgfspSOdumFvHW07txnBJ4dfCUFYOp lUoVtMq9ZIMchIpSZLvnOpgQEOb6JwW+BVNc88ur9CVO0GaJ76QTSrzCPLRp2Cerh38N j+QNEdu/1qdde5UJ8P9pEZ54nctSmJTt9ALEEvKBbe1Q14uhXXqF6ZmgXVK+mo41/+zg e+FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700813468; x=1701418268; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GLckDeXgV5HnWG39Vw4RNeMhUIPz/ZuOKSa/29ctzjo=; b=V+OtWuCmGpqTXUZIsjMzq4RpM0xnD4yq6WRZqISe45ugCu8UbhC98g1bENxEcWTgn9 JI2WawdEtWU7mtZLjGZG/7l0BFyLyYBtY2g0RQwDGQ6RF236wNrEyPgYW+uSEdJkE8c9 pKzexgTWpDkDznoMZdo1a4b7e4zZQzHPYtuKuAWTzq4mdO24UrnHE+MRkuBt6sLdZwmM psLnjoM5C1pdQHjfmCbUxcsXATuLdaj+tg0QgwVMBuIJg/VrvxzhRlCBYPR7pVF/SzNb naGN1bvPci+a1ac/V0bpdPGk3JeVUdIywCQ25shoCu9JcEGdtFgfn+cWfw4SVBfLHRDj +eHw== X-Gm-Message-State: AOJu0YzVx6VByHtp9Z8SBS1apNFHiC7OQaz85rtWP13Oxrcr2qJFXjDZ tMvmA3hCKNOvX+V7xmA2hKwBWV0lxDzvTM162DI= X-Google-Smtp-Source: AGHT+IGKrBFRamzhpLB/PeG2QrTiX0IUx6/YM8qN4FLerV7gNfRMnRbFo9A85NqdxHONAaZ5UbC7rz+wnmteJ8RUPmI= X-Received: by 2002:ac2:4309:0:b0:509:49fc:c25c with SMTP id l9-20020ac24309000000b0050949fcc25cmr1108938lfh.28.1700813467517; Fri, 24 Nov 2023 00:11:07 -0800 (PST) MIME-Version: 1.0 References: <20231123181343.27624-1-amonakov@ispras.ru> <20231123181343.27624-2-amonakov@ispras.ru> In-Reply-To: <20231123181343.27624-2-amonakov@ispras.ru> From: Richard Biener Date: Fri, 24 Nov 2023 09:10:47 +0100 Message-ID: Subject: Re: [PATCH 1/2] libcpp: configure: drop unused Valgrind detection To: Alexander Monakov Cc: gcc-patches@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Thu, Nov 23, 2023 at 7:14=E2=80=AFPM Alexander Monakov wrote: > > When top-level configure has either --enable-checking=3Dvalgrind or > --enable-valgrind-annotations, we want to activate a couple of workaround= s > in libcpp. They do not use anything from the Valgrind API, so just > delete all detection. OK > libcpp/ChangeLog: > > * config.in: Regenerate. > * configure: Regenerate. > * configure.ac (ENABLE_VALGRIND_CHECKING): Delete. > (ENABLE_VALGRIND_ANNOTATIONS): Rename to > ENABLE_VALGRIND_WORKAROUNDS. Delete Valgrind header checks. > * lex.cc (new_buff): Adjust for renaming. > (_cpp_free_buff): Ditto. > --- > libcpp/config.in | 15 ++-------- > libcpp/configure | 70 +-------------------------------------------- > libcpp/configure.ac | 51 ++------------------------------- > libcpp/lex.cc | 4 +-- > 4 files changed, 9 insertions(+), 131 deletions(-) > > diff --git a/libcpp/config.in b/libcpp/config.in > index df4fd44c9e..253ef03a3d 100644 > --- a/libcpp/config.in > +++ b/libcpp/config.in > @@ -24,12 +24,9 @@ > language is requested. */ > #undef ENABLE_NLS > > -/* Define to get calls to the valgrind runtime enabled. */ > -#undef ENABLE_VALGRIND_ANNOTATIONS > - > -/* Define if you want to workaround valgrind (a memory checker) warnings= about > - possible memory leaks because of libcpp use of interior pointers. */ > -#undef ENABLE_VALGRIND_CHECKING > +/* Define if you want to workaround Valgrind warnings about possible mem= ory > + leaks because of libcpp use of interior pointers. */ > +#undef ENABLE_VALGRIND_WORKAROUNDS > > /* Define to 1 if you have `alloca', as a function or macro. */ > #undef HAVE_ALLOCA > @@ -201,9 +198,6 @@ > /* Define to 1 if you have the header file. */ > #undef HAVE_LOCALE_H > > -/* Define if valgrind's memcheck.h header is installed. */ > -#undef HAVE_MEMCHECK_H > - > /* Define to 1 if you have the header file. */ > #undef HAVE_MEMORY_H > > @@ -252,9 +246,6 @@ > /* Define to 1 if you have the header file. */ > #undef HAVE_UNISTD_H > > -/* Define if valgrind's valgrind/memcheck.h header is installed. */ > -#undef HAVE_VALGRIND_MEMCHECK_H > - > /* Define as const if the declaration of iconv() needs const. */ > #undef ICONV_CONST > > diff --git a/libcpp/configure b/libcpp/configure > index 452e4c1f6c..8a38c0546e 100755 > --- a/libcpp/configure > +++ b/libcpp/configure > @@ -9116,12 +9116,6 @@ $as_echo "#define ENABLE_ASSERT_CHECKING 1" >>conf= defs.h > > fi > > -if test x$ac_valgrind_checking !=3D x ; then > - > -$as_echo "#define ENABLE_VALGRIND_CHECKING 1" >>confdefs.h > - > -fi > - > # Check whether --enable-canonical-system-headers was given. > if test "${enable_canonical_system_headers+set}" =3D set; then : > enableval=3D$enable_canonical_system_headers; > @@ -9405,62 +9399,6 @@ case x$enable_languages in > esac > > > -ac_fn_c_check_header_mongrel "$LINENO" "valgrind.h" "ac_cv_header_valgri= nd_h" "$ac_includes_default" > -if test "x$ac_cv_header_valgrind_h" =3D xyes; then : > - have_valgrind_h=3Dyes > -else > - have_valgrind_h=3Dno > -fi > - > - > - > -# It is certainly possible that there's valgrind but no valgrind.h. > -# GCC relies on making annotations so we must have both. > -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALGRIND_DISCARD i= n " >&5 > -$as_echo_n "checking for VALGRIND_DISCARD in ... " = >&6; } > -cat confdefs.h - <<_ACEOF >conftest.$ac_ext > -/* end confdefs.h. */ > -#include > -#ifndef VALGRIND_DISCARD > -#error VALGRIND_DISCARD not defined > -#endif > -_ACEOF > -if ac_fn_c_try_cpp "$LINENO"; then : > - gcc_cv_header_valgrind_memcheck_h=3Dyes > -else > - gcc_cv_header_valgrind_memcheck_h=3Dno > -fi > -rm -f conftest.err conftest.i conftest.$ac_ext > -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_header_valgrind= _memcheck_h" >&5 > -$as_echo "$gcc_cv_header_valgrind_memcheck_h" >&6; } > -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALGRIND_DISCARD i= n " >&5 > -$as_echo_n "checking for VALGRIND_DISCARD in ... " >&6; } > -cat confdefs.h - <<_ACEOF >conftest.$ac_ext > -/* end confdefs.h. */ > -#include > -#ifndef VALGRIND_DISCARD > -#error VALGRIND_DISCARD not defined > -#endif > -_ACEOF > -if ac_fn_c_try_cpp "$LINENO"; then : > - gcc_cv_header_memcheck_h=3Dyes > -else > - gcc_cv_header_memcheck_h=3Dno > -fi > -rm -f conftest.err conftest.i conftest.$ac_ext > -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_header_memcheck= _h" >&5 > -$as_echo "$gcc_cv_header_memcheck_h" >&6; } > -if test $gcc_cv_header_valgrind_memcheck_h =3D yes; then > - > -$as_echo "#define HAVE_VALGRIND_MEMCHECK_H 1" >>confdefs.h > - > -fi > -if test $gcc_cv_header_memcheck_h =3D yes; then > - > -$as_echo "#define HAVE_MEMCHECK_H 1" >>confdefs.h > - > -fi > - > # Check whether --enable-valgrind-annotations was given. > if test "${enable_valgrind_annotations+set}" =3D set; then : > enableval=3D$enable_valgrind_annotations; > @@ -9470,14 +9408,8 @@ fi > > if test x$enable_valgrind_annotations !=3D xno \ > || test x$ac_valgrind_checking !=3D x; then > - if (test $have_valgrind_h =3D no \ > - && test $gcc_cv_header_memcheck_h =3D no \ > - && test $gcc_cv_header_valgrind_memcheck_h =3D no); then > - as_fn_error $? "*** valgrind annotations requested, but" "$LINENO" 5 > - as_fn_error $? "*** Can't find valgrind/memcheck.h, memcheck.h or va= lgrind.h" "$LINENO" 5 > - fi > > -$as_echo "#define ENABLE_VALGRIND_ANNOTATIONS 1" >>confdefs.h > +$as_echo "#define ENABLE_VALGRIND_WORKAROUNDS 1" >>confdefs.h > > fi > > diff --git a/libcpp/configure.ac b/libcpp/configure.ac > index b29b4d6acf..b883fec776 100644 > --- a/libcpp/configure.ac > +++ b/libcpp/configure.ac > @@ -185,12 +185,6 @@ if test x$ac_assert_checking !=3D x ; then > [Define if you want assertions enabled. This is a cheap check.]) > fi > > -if test x$ac_valgrind_checking !=3D x ; then > - AC_DEFINE(ENABLE_VALGRIND_CHECKING, 1, > -[Define if you want to workaround valgrind (a memory checker) warnings a= bout > - possible memory leaks because of libcpp use of interior pointers.]) > -fi > - > AC_ARG_ENABLE(canonical-system-headers, > [ --enable-canonical-system-headers > enable or disable system headers canonicalizat= ion], > @@ -241,54 +235,15 @@ case x$enable_languages in > esac > AC_SUBST(CET_HOST_FLAGS) > > -dnl # This check AC_REQUIREs various stuff, so it *must not* be inside > -dnl # an if statement. This was the source of very frustrating bugs > -dnl # in converting to autoconf 2.5x! > -AC_CHECK_HEADER(valgrind.h, have_valgrind_h=3Dyes, have_valgrind_h=3Dno) > - > -# It is certainly possible that there's valgrind but no valgrind.h. > -# GCC relies on making annotations so we must have both. > -AC_MSG_CHECKING(for VALGRIND_DISCARD in ) > -AC_PREPROC_IFELSE([AC_LANG_SOURCE( > - [[#include > -#ifndef VALGRIND_DISCARD > -#error VALGRIND_DISCARD not defined > -#endif]])], > - [gcc_cv_header_valgrind_memcheck_h=3Dyes], > - [gcc_cv_header_valgrind_memcheck_h=3Dno]) > -AC_MSG_RESULT($gcc_cv_header_valgrind_memcheck_h) > -AC_MSG_CHECKING(for VALGRIND_DISCARD in ) > -AC_PREPROC_IFELSE([AC_LANG_SOURCE( > - [[#include > -#ifndef VALGRIND_DISCARD > -#error VALGRIND_DISCARD not defined > -#endif]])], > - [gcc_cv_header_memcheck_h=3Dyes], > - [gcc_cv_header_memcheck_h=3Dno]) > -AC_MSG_RESULT($gcc_cv_header_memcheck_h) > -if test $gcc_cv_header_valgrind_memcheck_h =3D yes; then > - AC_DEFINE(HAVE_VALGRIND_MEMCHECK_H, 1, > - [Define if valgrind's valgrind/memcheck.h header is installed.]) > -fi > -if test $gcc_cv_header_memcheck_h =3D yes; then > - AC_DEFINE(HAVE_MEMCHECK_H, 1, > - [Define if valgrind's memcheck.h header is installed.]) > -fi > - > AC_ARG_ENABLE(valgrind-annotations, > [AS_HELP_STRING([--enable-valgrind-annotations], > [enable valgrind runtime interaction])], [], > [enable_valgrind_annotations=3Dno]) > if test x$enable_valgrind_annotations !=3D xno \ > || test x$ac_valgrind_checking !=3D x; then > - if (test $have_valgrind_h =3D no \ > - && test $gcc_cv_header_memcheck_h =3D no \ > - && test $gcc_cv_header_valgrind_memcheck_h =3D no); then > - AC_MSG_ERROR([*** valgrind annotations requested, but]) > - AC_MSG_ERROR([*** Can't find valgrind/memcheck.h, memcheck.h or valg= rind.h]) > - fi > - AC_DEFINE(ENABLE_VALGRIND_ANNOTATIONS, 1, > -[Define to get calls to the valgrind runtime enabled.]) > + AC_DEFINE(ENABLE_VALGRIND_WORKAROUNDS, 1, > +[Define if you want to workaround Valgrind warnings about > + possible memory leaks because of libcpp use of interior pointers.]) > fi > > # Output. > diff --git a/libcpp/lex.cc b/libcpp/lex.cc > index 0b1b93609e..a5d2f31e76 100644 > --- a/libcpp/lex.cc > +++ b/libcpp/lex.cc > @@ -4762,7 +4762,7 @@ new_buff (size_t len) > len =3D MIN_BUFF_SIZE; > len =3D CPP_ALIGN (len); > > -#ifdef ENABLE_VALGRIND_ANNOTATIONS > +#ifdef ENABLE_VALGRIND_WORKAROUNDS > /* Valgrind warns about uses of interior pointers, so put _cpp_buff > struct first. */ > size_t slen =3D CPP_ALIGN2 (sizeof (_cpp_buff), 2 * DEFAULT_ALIGNMENT)= ; > @@ -4859,7 +4859,7 @@ _cpp_free_buff (_cpp_buff *buff) > for (; buff; buff =3D next) > { > next =3D buff->next; > -#ifdef ENABLE_VALGRIND_ANNOTATIONS > +#ifdef ENABLE_VALGRIND_WORKAROUNDS > free (buff); > #else > free (buff->base); > -- > 2.39.2 >