From patchwork Mon Mar 13 20:16:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 69092 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1386463wrd; Mon, 13 Mar 2023 13:17:38 -0700 (PDT) X-Google-Smtp-Source: AK7set82gw8FA825m3odMwkv4AP9BgRf4ikWM/0gASs8ubVvB2VizXh0rMFXkSgUei66UMmR2yvt X-Received: by 2002:a17:907:a094:b0:8aa:c143:ffe1 with SMTP id hu20-20020a170907a09400b008aac143ffe1mr37728307ejc.48.1678738658129; Mon, 13 Mar 2023 13:17:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678738658; cv=none; d=google.com; s=arc-20160816; b=OHq+VYtYXBbKFQBXrChL2KEAn0UdxdfL7EFtXxMFOuPItxNEXe764RAC6eCqYrG6N9 m3ulLQuG2yUCIYLkUIu7IM6KvB8Lp2qHumxMwcX0XnRDB92+wGtwDcpjOuNh3/9DYi4d Sz7HDJKA26X0S7Ib83D8JMOXanqfcnbq4guqpvmuEQT/cjsRVnyAKzATb79fou3VZ+c2 5iVBWG7/lVbzzcoG+RSZfzKPEiXEEmtmiBSMgaNBikZoTAmzqHSeqzC0zMw8LZojlWLk /GlrPWv1vAEKC3Hv+7oScgoU6XDVqAdodB4xf16zYC3rxpuiCglSs9pScXBF4yHCQQOn tujw== 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 :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=rDRtOP9kr9EaBsTrqk936+ANss36pjC3Vb+09aipucg=; b=LGmfXIkBrROqG4AN2R2C0D9DsW05Q8Ikfx/npeKqkzLvg8XoPdTQ91YDZdncLXf+Jf 6Q5M6ERBMcUpRuN1cQi8ENf5oMtiCS8Omtqb9c2YyoKfRPg3aYtJXnKIf3eYv1YBIPwO c121E4uVSChxDlLI735QBKSQLDOQN0hA4eocQgBxPUFfR8QaKLbr5eyUYg56wgb5GBFd qaZr/FuevY9uo90mtwmeklicNa2KBj/YlKcju4l5Majcy48XfF2xq+ZJ5PMhDybIiPjD d5kQPuwG5s8kebdnmUsIegrSwlHrzVrWfY1f6ov9/WBbBO1Zs0nt7c8F//wWxCfGdplS VQDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=pxlJutcc; 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 z25-20020a170906715900b008b79a5e7440si594626ejj.117.2023.03.13.13.17.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 13:17:38 -0700 (PDT) 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=pxlJutcc; 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 674003858428 for ; Mon, 13 Mar 2023 20:17:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 674003858428 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678738649; bh=rDRtOP9kr9EaBsTrqk936+ANss36pjC3Vb+09aipucg=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=pxlJutccD4KpYbaIp3yCo93jye1XmY8HBiOyOYwNH2elNGu26pd5P5WzD6jJoMtD9 ZB714KBseU6i/pDzQjrJiz4ee8AhpbgaqbhuUZgqW1LCyf2mJH0pxVjGJsia+e5lu8 cDcV94XKP/Kgqo8sAQ4KgEjJPMjkVYwambxUDG8o= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id C42A93858D1E for ; Mon, 13 Mar 2023 20:16:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C42A93858D1E Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-IWoEqsb2OaWO28j1wqWU6g-1; Mon, 13 Mar 2023 16:16:44 -0400 X-MC-Unique: IWoEqsb2OaWO28j1wqWU6g-1 Received: by mail-qt1-f199.google.com with SMTP id t22-20020ac86a16000000b003bd1c0f74cfso7464547qtr.20 for ; Mon, 13 Mar 2023 13:16:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678738603; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rDRtOP9kr9EaBsTrqk936+ANss36pjC3Vb+09aipucg=; b=To1tywAb99gxr3GGJn5mRb9x1PiUwFcet4Tds/w5m6usRlp3TCo72GRIJCDrYlgsL5 3Weug9yV1QXjt5KeGjLGyfcU+mYLj5lcwZ2wpQpGy+CqZU9GvHN8fNjxfJPcbgOZKZcy LgL4nmSKsL453tWNigvVCM3O0pJ0ukPnasAMj/G2M8nCKb8LHqTMHeiraN1kY9KldCEN ZOQjaKfUWJBZFeVs7Z6yUQD2gre+il6LSgF13Ed8uRjxfXqKDW3oqyFjbbrX3CzritwN wp0/MZMVErOmXyDp0PRA5gSNC9bwoAa2qqXDYNhUo/MSL6OaIv2fLedYQtYoZBaplGup N8Zw== X-Gm-Message-State: AO0yUKWfc9zYlR+eC3BGZh2rSEpIf5Qd7JKiDP8O3oM2q2VmkJp7y3LN HuD8GyyewMiaeWP74OnrRF+Qsxxr0jCxsK0mBW2dcru1cYs1dU3XS7zwcF8bpxojovoOOaG1Hpu n6Uk6KEAknFUDnP80NK17ktcvNJwoCS27jErq3+KZzQ6bSIivwgqjFSUqkptLeQDMzqn3KHBwJQ == X-Received: by 2002:ac8:5a13:0:b0:3b8:6b6b:28c2 with SMTP id n19-20020ac85a13000000b003b86b6b28c2mr60409351qta.68.1678738603068; Mon, 13 Mar 2023 13:16:43 -0700 (PDT) X-Received: by 2002:ac8:5a13:0:b0:3b8:6b6b:28c2 with SMTP id n19-20020ac85a13000000b003b86b6b28c2mr60409306qta.68.1678738602548; Mon, 13 Mar 2023 13:16:42 -0700 (PDT) Received: from jason.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id a5-20020ae9e805000000b0074240840c25sm326586qkg.108.2023.03.13.13.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 13:16:41 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Jakub Jelinek Subject: [pushed] c++: handle _FloatNN redeclaration like bool [PR107128] Date: Mon, 13 Mar 2023 16:16:36 -0400 Message-Id: <20230313201636.152901-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill 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?1760285066890772394?= X-GMAIL-MSGID: =?utf-8?q?1760285066890772394?= Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- It's been inconvenient to compile testcases preprocessed with GCC 12 or earlier because they break on typedef __float128 _Float128; We already had code for handling this with bool and wchar_t, it just needs to be extended to _FloatNN as well. PR c++/107128 gcc/cp/ChangeLog: * parser.cc (cp_parser_set_decl_spec_type): Use redefined_builtin_type for extended_float_type_p. gcc/testsuite/ChangeLog: * g++.dg/warn/pragma-system_header6.h: New test. * g++.dg/warn/pragma-system_header6.C: New test. --- gcc/testsuite/g++.dg/warn/pragma-system_header6.h | 3 +++ gcc/cp/parser.cc | 2 ++ gcc/testsuite/g++.dg/warn/pragma-system_header6.C | 1 + 3 files changed, 6 insertions(+) create mode 100644 gcc/testsuite/g++.dg/warn/pragma-system_header6.h create mode 100644 gcc/testsuite/g++.dg/warn/pragma-system_header6.C base-commit: 8e9c65d34c799c9dadea1e2e60b4180f26262829 diff --git a/gcc/testsuite/g++.dg/warn/pragma-system_header6.h b/gcc/testsuite/g++.dg/warn/pragma-system_header6.h new file mode 100644 index 00000000000..989ccd8795a --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/pragma-system_header6.h @@ -0,0 +1,3 @@ +#pragma GCC system_header + +typedef float _Float32; diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 533041946c0..a277003ea58 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -33452,10 +33452,12 @@ cp_parser_set_decl_spec_type (cp_decl_specifier_seq *decl_specs, C++-safe. */ if (decl_spec_seq_has_spec_p (decl_specs, ds_typedef) && !type_definition_p + && TYPE_P (type_spec) && (type_spec == boolean_type_node || type_spec == char8_type_node || type_spec == char16_type_node || type_spec == char32_type_node + || extended_float_type_p (type_spec) || type_spec == wchar_type_node) && (decl_specs->type || decl_spec_seq_has_spec_p (decl_specs, ds_long) diff --git a/gcc/testsuite/g++.dg/warn/pragma-system_header6.C b/gcc/testsuite/g++.dg/warn/pragma-system_header6.C new file mode 100644 index 00000000000..924e4522cf0 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/pragma-system_header6.C @@ -0,0 +1 @@ +#include "pragma-system_header6.h"