From patchwork Thu Sep 28 16:37:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitry Andric X-Patchwork-Id: 146207 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3443102vqu; Thu, 28 Sep 2023 09:37:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEsNur2ri5YY0ymUPYEZaqep1/SItMBXBpXGODtA3xDZvKlAsU4PJ6objhLDKrkXdVlSjak X-Received: by 2002:a17:906:7496:b0:9b2:74a1:6b30 with SMTP id e22-20020a170906749600b009b274a16b30mr1871319ejl.33.1695919073401; Thu, 28 Sep 2023 09:37:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695919073; cv=none; d=google.com; s=arc-20160816; b=sOfEChFP3BcApR2raWmDox+OcCKMn/aYUzDzs8SXRj9gKSB9t/2HWmtaHwhkm3YAO1 Gh6aQIN6dE8sTm07t6czoNtRtN8ZFYzNSbcIZswoQRDcaQSpDYXb/Eeu9BpXpO18nl+Z x/jpBDPlBQoeTEHV2yaD2fbDq3zAloKdnZJ1Cv1cGKGphECaiYzyO0wnqwcTmJBcdBEF XIk79M0Vi47/QE2JeV9J0761YUyi/olG0kU38Ev30nidrCvsKCiOLd0Zv0ywbGNvhLaU uwXHyDnOhebgkErJK+UDTCy/Xf0cIsfGHnd4E0n4puZLRRShfhTHIiXIbYTWGCjcmLxM 2wDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:to:cc:date:message-id:subject :mime-version:content-transfer-encoding:from:dkim-signature :dmarc-filter:delivered-to; bh=m4sszGulhtdMb/5LMNc98MT/0o80qa6uRa3LCRZ2O2Q=; fh=YkFUnlfPzsSPfZhEWaJOGo7AMZMG7kps7SPgjkWimjs=; b=A+FXbN4n9gL69IwJPf1Q/NUm4bVkcDkQohxpGzLuIYwQeDbGXLymDCC9XAI55/z4AM gzP6pVdCVM9iMfAWAUz0taIoS8nhr77A/4G9MVr66XGXZwyedY1tNqQKRtse40eM0Kyq aExxcGeeigPHq6/faSWqndpruwZFMuag+T3mz/Er1TIXp6fTIJ55LUea02W8EduZPKmN 0cjqDWhdlrw1pcX9m2Wmv6UGgwO5juQOz8F+TlsDHIiJQWFIOpDDUgl0dJuNZMSpo/hR STRrq28QtKJ971mli88AKW3HXriPv1D7ugFbfgcoRcUkVGnM1UnJMzGBfLd07byoEQAa kf9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@andric.com header.s=201904 header.b=Kg++iD30; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=andric.com Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id br17-20020a170906d15100b00992ee6da8e7si15285325ejb.740.2023.09.28.09.37.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 09:37:53 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@andric.com header.s=201904 header.b=Kg++iD30; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=andric.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E01D23858413 for ; Thu, 28 Sep 2023 16:37:47 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) by sourceware.org (Postfix) with ESMTPS id 09C8C3858C52 for ; Thu, 28 Sep 2023 16:37:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 09C8C3858C52 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=andric.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andric.com 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 5E0F6263DF; Thu, 28 Sep 2023 18:37:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=andric.com; s=201904; t=1695919042; bh=5x47QOnlMy+MqY1mA2eK9bbRbPWZZkOAYcCiUZSe/+0=; h=From:Subject:Message-Id:Date:Cc:To:From; b=Kg++iD30LC0vEuEZjGnRyYwcMt0Jbnd/ae/NfatF7dgOlWqqWudPCE60LEegxZ8nD kYAqRaRAPb7Nwh16NT65wqy3TJCGXaSxsSj2CKiuELol0+I1Y8lZChOyilnmDst6W3 KTGPHTIE0hAARf8qCQ3yFVK+13ydvq83hFt66xuD8mEL6hCbxVw79t+1wAdzmnKZUo NzbFN+ws7ja/i8xugcl4Ki4yPh47XgDWGiAuHDhBDRW1JEHj8lUnjvxIELdoafbjyB ZtxiyZl73Mp9ViqQwQectwUhmJzwsG3Gqowp9MUpwKrtWIksMDBQeIWFzpXeMPzCne NVReA+Pb6DqeA== From: Dimitry Andric Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: [PATCH] Include safe-ctype.h after C++ standard headers, to avoid over-poisoning Message-Id: <0623E896-6B99-49EC-9144-B41BC51089F0@andric.com> Date: Thu, 28 Sep 2023 18:37:11 +0200 Cc: Gerald Pfeifer To: gcc-patches@gcc.gnu.org X-Mailer: Apple Mail (2.3731.700.6) X-Spam-Status: No, score=-9.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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778300038453805534 X-GMAIL-MSGID: 1778300038453805534 Ref: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111632 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: 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 | ^ This is because libc++ uses different transitive includes than libstdc++, and some of those transitive includes pull in various ctype declarations (typically via ). 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. Signed-off-by: Dimitry Andric --- gcc/system.h | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) 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 -/* 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 */ #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 +/* 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