From patchwork Wed Apr 19 15:20:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1770766 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=BMXENPsp; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q1kxy0DdBz23tD for ; Thu, 20 Apr 2023 01:20:36 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 47D563858C31 for ; Wed, 19 Apr 2023 15:20:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 47D563858C31 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1681917634; bh=MvcS1vcwiJXHoxwGR3kque1JJ/JHp62N3eqd19Lrpps=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=BMXENPspn5Qol1rMs83xC3XPobEZJ9VMdtNnBs4X3YuVs34x5z/XFQdYggz2bPy1D 1R8YYVpCt2Yfnfz0n0KShLV0e/A+566IjDqJZzDE+Bk8bqxZ8UTqLZtlW/b1ZgqRu9 HeMugHpeWKdvCDz7X4cvX44h/G5xpwMRa2FiXcSY= 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 16E5B3857347 for ; Wed, 19 Apr 2023 15:20:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 16E5B3857347 Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-642-f1QFU6NUOCaHC6WeB5LaWA-1; Wed, 19 Apr 2023 11:20:13 -0400 X-MC-Unique: f1QFU6NUOCaHC6WeB5LaWA-1 Received: by mail-qt1-f200.google.com with SMTP id 13-20020ac8590d000000b003eaf7aca024so11110622qty.22 for ; Wed, 19 Apr 2023 08:20:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681917612; x=1684509612; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MvcS1vcwiJXHoxwGR3kque1JJ/JHp62N3eqd19Lrpps=; b=jF7JrZ3unHdVjfQADicaESZO1R2g27eompx8AcYXCvfeAAlAlZoNSKd6VfJdk5erne KHnVal2SgiLUKiFf5ApFISrtdGIzT9Zd2q3zewNak5ScjtkdP0+iL/GUYxeGpWKmHawj o6j6cOdoX5UF2qtccNNvJeK9RXlrTVKQJtN3/VpOJPHxRctDcekD99HIKsHpPFLQd3M0 3ZYW2JvnPFNvyR1YTCkZ7nQo+yFJI7wqgCVlVMJiuf1z4aqicHn0YnE4gfYJKcmV1fMd XMUNeZ0OmpXzpdPMHasfe0Dt555G6O1dq44AOGFHG38P/zFpCLC0Gc+bufMNzn/w61In /rZQ== X-Gm-Message-State: AAQBX9doLmSbeZ/ddG43M6U65xql8lCH1cF5zjS5m9KUTTSA9/Z57Txn NlP+FUPmj0gA8KycVif0BYkPoiRohDwBP7w/mLcN146Q3uTIFuzmvcrQLEJiLn4n8xTkc+0ik4Z Ctwg50NNNjVSQzt/m8f4WeAZcC2SRXFwMirKvRCKTwJrHtCduP+7sTS5/tZm+f2UgeX1p5CGLmA == X-Received: by 2002:a05:6214:2607:b0:5ef:4763:2f4c with SMTP id gu7-20020a056214260700b005ef47632f4cmr31829716qvb.36.1681917612500; Wed, 19 Apr 2023 08:20:12 -0700 (PDT) X-Google-Smtp-Source: AKy350YdX9fSf6I3XmdP+1McL2COz1OcWftjpUb/vUllprqqSqaUI0GG1iMM5L1YdERsBMTFUyqGag== X-Received: by 2002:a05:6214:2607:b0:5ef:4763:2f4c with SMTP id gu7-20020a056214260700b005ef47632f4cmr31829650qvb.36.1681917611933; Wed, 19 Apr 2023 08:20:11 -0700 (PDT) Received: from jason.com (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id d15-20020a0cc68f000000b005ef5f8dc89esm3297407qvj.88.2023.04.19.08.20.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 08:20:11 -0700 (PDT) To: gcc-patches@gcc.gnu.org, Jakub Jelinek Subject: [13 PATCH RFA] c++: fix 'unsigned __int128_t' semantics [PR108099] Date: Wed, 19 Apr 2023 11:20:09 -0400 Message-Id: <20230419152009.494469-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.7 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, 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 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" When I was backporting the earlier 108099 patch I finally saw your comments on the PR about the meaning of this pattern with the patch being wrong (and a regression from 11). This fixes that regression; fixing the broader issues can wait. Tested x86_64-pc-linux-gnu, OK for 13.1 or wait for 13.2? -- 8< -- My earlier patch for 108099 made us accept this non-standard pattern but messed up the semantics, so that e.g. unsigned __int128_t was not a 128-bit type. PR c++/108099 gcc/cp/ChangeLog: * decl.cc (grokdeclarator): Keep typedef_decl for __int128_t. gcc/testsuite/ChangeLog: * g++.dg/ext/int128-8.C: New test. --- gcc/cp/decl.cc | 6 ++++-- gcc/testsuite/g++.dg/ext/int128-8.C | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/ext/int128-8.C base-commit: 57aecdbc118d4c1900d651cb3ada2c9632a67ad0 diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 772c059dc2c..ab5cb69b2ae 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -12482,12 +12482,14 @@ grokdeclarator (const cp_declarator *declarator, key, typedef_decl); ok = !flag_pedantic_errors; if (is_typedef_decl (typedef_decl)) - type = DECL_ORIGINAL_TYPE (typedef_decl); + { + type = DECL_ORIGINAL_TYPE (typedef_decl); + typedef_decl = NULL_TREE; + } else /* PR108099: __int128_t comes from c_common_nodes_and_builtins, and is not built as a typedef. */ type = TREE_TYPE (typedef_decl); - typedef_decl = NULL_TREE; } else if (declspecs->decltype_p) error_at (loc, "%qs specified with %", key); diff --git a/gcc/testsuite/g++.dg/ext/int128-8.C b/gcc/testsuite/g++.dg/ext/int128-8.C new file mode 100644 index 00000000000..14bbc49f5c3 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/int128-8.C @@ -0,0 +1,24 @@ +// PR c++/108099 +// { dg-do compile { target c++11 } } +// { dg-options "" } + +using u128 = unsigned __int128_t; +using s128 = signed __int128_t; +template struct integral_constant { + static constexpr T value = v; +}; +typedef integral_constant false_type; +typedef integral_constant true_type; +template +struct is_same : false_type {}; +template +struct is_same : true_type {}; +static_assert (is_same <__int128, s128>::value, ""); +static_assert (is_same ::value, ""); +static_assert (is_same <__int128_t, s128>::value, ""); +static_assert (is_same ::value, ""); // { dg-bogus "" "" { xfail *-*-* } } +static_assert (is_same <__uint128_t, u128>::value, ""); // { dg-bogus "" "" { xfail *-*-* } } +static_assert (sizeof (s128) == sizeof (__int128), ""); +static_assert (sizeof (u128) == sizeof (unsigned __int128), ""); +static_assert (s128(-1) < 0, ""); +static_assert (u128(-1) > 0, "");