From patchwork Fri Feb 17 06:42:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 58357 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp734234wrn; Thu, 16 Feb 2023 22:46:11 -0800 (PST) X-Google-Smtp-Source: AK7set9J7yK/6i00BtVoE0QKY280ieW42T4FjMSfHri6cAcHHDnQhpC5i8Y/nYFY3Gl/YN4IhQk+ X-Received: by 2002:a17:906:7c16:b0:889:b38b:4bb2 with SMTP id t22-20020a1709067c1600b00889b38b4bb2mr9017487ejo.49.1676616371027; Thu, 16 Feb 2023 22:46:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676616371; cv=none; d=google.com; s=arc-20160816; b=R0E0pOL3/zy/iLgvIhRXv2LmASF2Wi/5edGxv5BHImgd7u6nP+Z0mppogbcdJxmER3 ZrHXwZ3squ7hEsUu6mG1xwzIcqsRNV0c+a6rv4QZ7aRJcUbtsjG4umH9HOFaN89ZSJFk 2hzWJWjG7sIlzZwjWoDpP9FjP4pDkKyxOnpTKa/jCfIRc0xezt7lVaqfjfZZ9QoaQSFo YH8Bujl87NZ45yOCgwMF8CntiLP/+GbOARKFfxeZl9rtQ9IO+EvL9DR5VB6bqcog47cI zTvT8T8Jmvr2LD/yefb+c9Dv5Hr4nr5kaLmLlvyQJkdw7YG2gsLkh0cG4L02v3V6DsCK tBWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mime-version :user-agent:message-id:date:organization:subject:cc:to:dmarc-filter :delivered-to:dkim-signature:dkim-filter; bh=Adm48fpC5o1txMD8uqXQ7cARTgdV/wTNFw/R7yvFmRw=; b=v/aGJJQ1ukUNwqsWqJmXlr8IkAQAg9xvAcy3kp5xqgrzeIRwLT/FX0HbC5cfr+8gxA Stlqp826Nflj4N68rRIsGMr3Tdn750m/8/F01a17lw5mQfbI57AIvnbnFlrIZZhG9Kgp Hwz33xPhTaySBORyiCvidQ2Tu93Ny1GNBv31DOxRuRN9eJLJptvSZFD27CNgGktCiAd3 cKLUNjZ40mMp8MfNR+nM+MjfKUKDsQ3cdMnarxQ2WllIY+H6LaLdYBXeJMnjgVsa0fMl VdfTrkDpt/dFsN+d7pIXmRXeAjawaVk3QJ87zbcWPui5bfeYGcAi9eQNQrWXKOoxnzVx Aajg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=T8Ewcqbi; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id vj23-20020a170907131700b008b147de0571si4028656ejb.185.2023.02.16.22.46.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 22:46:11 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=T8Ewcqbi; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CBFB93858D33 for ; Fri, 17 Feb 2023 06:46:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CBFB93858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676616369; bh=Adm48fpC5o1txMD8uqXQ7cARTgdV/wTNFw/R7yvFmRw=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=T8EwcqbiUF2x3EHTXXHIAhELmNfB+4vA6+caMXmX7r9kGL1lwKCmXq0jcKAFAcBRR Coeq3dpEbGnyEzxn93hljOJ6IwscW8a7EL8EYE3zMuY/yWLyfw2/S92l7bX5dkN/s8 nklG+vxKu0kyf8SqQJWvgUmNfENSq0l5Q/tqQzUI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTPS id 46CD43858D33 for ; Fri, 17 Feb 2023 06:45:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 46CD43858D33 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id E5A0E116B60; Fri, 17 Feb 2023 01:45:26 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id VgAEm98VWmCD; Fri, 17 Feb 2023 01:45:26 -0500 (EST) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id 9BFB2116A36; Fri, 17 Feb 2023 01:45:26 -0500 (EST) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 31H6gLoB090055 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 17 Feb 2023 03:42:21 -0300 To: gcc-patches@gcc.gnu.org Cc: ro@CeBiTec.Uni-Bielefeld.DE, mikestump@comcast.net, jason@redhat.com, nathan@acm.org Subject: [PR100127] Test for coroutine header in clang-compatible tests Organization: Free thinker, does not speak for AdaCore Date: Fri, 17 Feb 2023 03:42:21 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alexandre Oliva via Gcc-patches From: Alexandre Oliva Reply-To: Alexandre Oliva Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758059687823981023?= X-GMAIL-MSGID: =?utf-8?q?1758059687823981023?= The test is compatible with clang as well as gcc, but ISTM that testing for the __clang__ macro is just as potentially error-prone as macros that used to be GCC-specific are now defined in compilers that aim for GCC compatibility. Use a __has_include feature test instead. Regstrapped on x86_64-linux-gnu. Tested on arm-vxworks7 (gcc-12) and arm-eabi (trunk). Ok to install? for gcc/testsuite/ChangeLog PR c++/100127 * g++.dg/coroutines/pr100127.C: Test for header rather than compiler macro. --- gcc/testsuite/g++.dg/coroutines/pr100127.C | 2 +- gcc/testsuite/g++.dg/coroutines/pr100772-a.C | 2 +- gcc/testsuite/g++.dg/coroutines/pr100772-b.C | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/g++.dg/coroutines/pr100127.C b/gcc/testsuite/g++.dg/coroutines/pr100127.C index 374cd710077af..1eaa72ff0acdd 100644 --- a/gcc/testsuite/g++.dg/coroutines/pr100127.C +++ b/gcc/testsuite/g++.dg/coroutines/pr100127.C @@ -1,4 +1,4 @@ -#ifdef __clang__ +#if __has_include() // for __clang__ #include namespace std { using namespace std::experimental; diff --git a/gcc/testsuite/g++.dg/coroutines/pr100772-a.C b/gcc/testsuite/g++.dg/coroutines/pr100772-a.C index a325d384fc390..724c377c82e5b 100644 --- a/gcc/testsuite/g++.dg/coroutines/pr100772-a.C +++ b/gcc/testsuite/g++.dg/coroutines/pr100772-a.C @@ -1,5 +1,5 @@ // { dg-additional-options "-fsyntax-only " } -#ifdef __clang__ +#if __has_include() // for __clang__ #include namespace std { using namespace std::experimental; diff --git a/gcc/testsuite/g++.dg/coroutines/pr100772-b.C b/gcc/testsuite/g++.dg/coroutines/pr100772-b.C index 6cdf8d1e529e5..4cf31e5f9e0c2 100644 --- a/gcc/testsuite/g++.dg/coroutines/pr100772-b.C +++ b/gcc/testsuite/g++.dg/coroutines/pr100772-b.C @@ -1,4 +1,4 @@ -#ifdef __clang__ +#if __has_include() // for __clang__ #include namespace std { using namespace std::experimental;