From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) by sourceware.org (Postfix) with ESMTPS id 3A8E9385DC02 for ; Thu, 26 Oct 2023 17:01:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3A8E9385DC02 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=andric.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andric.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3A8E9385DC02 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=87.251.56.140 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698339672; cv=none; b=rLe3tUY1tsSgDnchYJHQu8Nu+VbTgCuOnq5vKJTeALKTFtb34t52WYYBopOafYykiFix1omY+CQVTNwVziUafqZd5XuiWbwy1Tdv3Ojl4D6ZFPwBgFUqy+rItjs5iS89u83ycTEfO3p6qCnYwGals+xPozkuid0bg+C5vAiHO28= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698339672; c=relaxed/simple; bh=N3NdUhMlKB0n88pAaqfU95xltAmsN0L748hISqX02Pg=; h=DKIM-Signature:Mime-Version:Subject:From:Date:Message-Id:To; b=SbkrmnjE956Kdg0k80eAmu8ADhpGzf3mAlpVzoRzVeCLA9SUcM2gwAEw1uIaBOvh/Cmb+g+FDcSjLQKcBMIB6POMZIKFgKtWzMMvWUMHhbivoeU1ApC41dKMm3NDkUDoh/L+ZApojjgzjrMg/FNtdgwqIwDYcGhRLsGiJ+VxjqY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 7C4B65F4AD; Thu, 26 Oct 2023 19:01:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=andric.com; s=201904; t=1698339668; bh=N3NdUhMlKB0n88pAaqfU95xltAmsN0L748hISqX02Pg=; h=Subject:From:In-Reply-To:Date:Cc:Message-Id:References:To:From; b=nWJp/G1wXdcubRLl8DCPZzjoNyjKyLiyD4PABcMrSO4P38pESnmBPzH182tJXcaTW rJWL2s2iEiDbVYmnRUEb5lJBeRs2kvjZFNYypekUc4JK4/N1ktP1gKdR0zTr3vV+qI BK7yhoTxOaZik5XD75tEzacuJM6voSwEL1uoUj9+xzr4txuZL9YpJ1+UjPo3yeQfjd MfkMYEluPKUqXTU883pmwPVSNWABYflMlTIygeAyre21rLedRNn5+gnMgmrahoBKX/ 7ZzV7Auiw82jhCGYaqQjc6dFfWsBOc/Qp54rCDq7NiZwjLFSC+XcBWzQ5BI0tNuBgQ OrGWY3+kC7ASg== Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: [PING][PATCH] Include safe-ctype.h after C++ standard headers, to avoid over-poisoning From: Dimitry Andric In-Reply-To: <0623E896-6B99-49EC-9144-B41BC51089F0@andric.com> Date: Thu, 26 Oct 2023 19:00:58 +0200 Cc: Gerald Pfeifer Content-Transfer-Encoding: quoted-printable Message-Id: References: <0623E896-6B99-49EC-9144-B41BC51089F0@andric.com> To: gcc-patches@gcc.gnu.org X-Mailer: Apple Mail (2.3731.700.6) X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP 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: Ping. It would be nice to get this QoL fix in. -Dimitry > On 28 Sep 2023, at 18:37, Dimitry Andric wrote: >=20 > Ref: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D111632 >=20 > When building gcc's C++ sources against recent libc++, the poisoning = of > the ctype macros due to including safe-ctype.h before including C++ > standard headers such as , , etc, causes many compilation > errors, similar to: >=20 > In file included from /home/dim/src/gcc/master/gcc/gensupport.cc:23: > In file included from /home/dim/src/gcc/master/gcc/system.h:233: > In file included from /usr/include/c++/v1/vector:321: > In file included from > /usr/include/c++/v1/__format/formatter_bool.h:20: > In file included from > /usr/include/c++/v1/__format/formatter_integral.h:32: > In file included from /usr/include/c++/v1/locale:202: > /usr/include/c++/v1/__locale:546:5: error: '__abi_tag__' attribute > only applies to structs, variables, functions, and namespaces > 546 | _LIBCPP_INLINE_VISIBILITY > | ^ > /usr/include/c++/v1/__config:813:37: note: expanded from macro > '_LIBCPP_INLINE_VISIBILITY' > 813 | # define _LIBCPP_INLINE_VISIBILITY _LIBCPP_HIDE_FROM_ABI > | ^ > /usr/include/c++/v1/__config:792:26: note: expanded from macro > '_LIBCPP_HIDE_FROM_ABI' > 792 | > __attribute__((__abi_tag__(_LIBCPP_TOSTRING( > _LIBCPP_VERSIONED_IDENTIFIER)))) > | ^ > In file included from /home/dim/src/gcc/master/gcc/gensupport.cc:23: > In file included from /home/dim/src/gcc/master/gcc/system.h:233: > In file included from /usr/include/c++/v1/vector:321: > In file included from > /usr/include/c++/v1/__format/formatter_bool.h:20: > In file included from > /usr/include/c++/v1/__format/formatter_integral.h:32: > In file included from /usr/include/c++/v1/locale:202: > /usr/include/c++/v1/__locale:547:37: error: expected ';' at end of > declaration list > 547 | char_type toupper(char_type __c) const > | ^ > /usr/include/c++/v1/__locale:553:48: error: too many arguments > provided to function-like macro invocation > 553 | const char_type* toupper(char_type* __low, const > char_type* __high) const > | ^ > /home/dim/src/gcc/master/gcc/../include/safe-ctype.h:146:9: note: > macro 'toupper' defined here > 146 | #define toupper(c) do_not_use_toupper_with_safe_ctype > | ^ >=20 > This is because libc++ uses different transitive includes than > libstdc++, and some of those transitive includes pull in various ctype > declarations (typically via ). >=20 > There was already a special case for including before > safe-ctype.h, so move the rest of the C++ standard header includes to > the same location, to fix the problem. >=20 > Signed-off-by: Dimitry Andric > --- > gcc/system.h | 39 ++++++++++++++++++--------------------- > 1 file changed, 18 insertions(+), 21 deletions(-) >=20 > diff --git a/gcc/system.h b/gcc/system.h > index e924152ad4c..7a516b11438 100644 > --- a/gcc/system.h > +++ b/gcc/system.h > @@ -194,27 +194,8 @@ extern int fprintf_unlocked (FILE *, const char = *, ...); > #undef fread_unlocked > #undef fwrite_unlocked >=20 > -/* Include before "safe-ctype.h" to avoid GCC poisoning > - the ctype macros through safe-ctype.h */ > - > -#ifdef __cplusplus > -#ifdef INCLUDE_STRING > -# include > -#endif > -#endif > - > -/* There are an extraordinary number of issues with . > - The last straw is that it varies with the locale. Use libiberty's > - replacement instead. */ > -#include "safe-ctype.h" > - > -#include > - > -#include > - > -#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO > -extern int errno; > -#endif > +/* Include C++ standard headers before "safe-ctype.h" to avoid GCC > + poisoning the ctype macros through safe-ctype.h */ >=20 > #ifdef __cplusplus > #if defined (INCLUDE_ALGORITHM) || !defined (HAVE_SWAP_IN_UTILITY) > @@ -229,6 +210,9 @@ extern int errno; > #ifdef INCLUDE_SET > # include > #endif > +#ifdef INCLUDE_STRING > +# include > +#endif > #ifdef INCLUDE_VECTOR > # include > #endif > @@ -245,6 +229,19 @@ extern int errno; > # include > #endif >=20 > +/* There are an extraordinary number of issues with . > + The last straw is that it varies with the locale. Use libiberty's > + replacement instead. */ > +#include "safe-ctype.h" > + > +#include > + > +#include > + > +#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO > +extern int errno; > +#endif > + > /* Some of glibc's string inlines cause warnings. Plus we'd rather > rely on (and therefore test) GCC's string builtins. */ > #define __NO_STRING_INLINES > --=20 > 2.42.0 >=20