From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id DB75D3858436 for ; Sun, 13 Nov 2022 11:50:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DB75D3858436 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668340215; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=f7mplHAjxIk8kJPZlnyuAOrIeav05MvRFZwIZd1y5sQ=; b=DVmWJkz4hSQNYlWp0rnbPLSAxV3Gy4m1W4siCbIDBMIwH1S/sGkelDZ+iI7ZIbpcED+WXN IEmKvjFMaJazuvdytiVcDoyjJ/V+exUxfCSIEATqaDrgmdrANVN43O2fsTZ1JxQRtMX6x3 m9AB8TPuWvDEsW8i52HwrEsODI4V+qE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-537-7i5uQ0UwMByIqS14ANri_w-1; Sun, 13 Nov 2022 06:50:14 -0500 X-MC-Unique: 7i5uQ0UwMByIqS14ANri_w-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0ECC2800B23 for ; Sun, 13 Nov 2022 11:50:14 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C4A642166B2B; Sun, 13 Nov 2022 11:50:13 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 2ADBo9ce2803531 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Sun, 13 Nov 2022 12:50:09 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 2ADBo8WR2803530; Sun, 13 Nov 2022 12:50:08 +0100 Date: Sun, 13 Nov 2022 12:50:08 +0100 From: Jakub Jelinek To: Jason Merrill Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] c++, v2: Implement CWG2635 - Constrained structured bindings Message-ID: Reply-To: Jakub Jelinek References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 List-Id: On Sat, Nov 12, 2022 at 12:23:56PM +0100, Jakub Jelinek wrote: > The following patch implements CWG2635. > > So far tested on > GXX_TESTSUITE_STDS=98,11,14,17,20,2b make check-g++ RUNTESTFLAGS="dg.exp=decomp*" > ok for trunk if it passes full bootstrap/regtest and it is voted in? Here is another version of the patch that passed bootstrap/regtest, the only change are tweaks to 2 further testcases. 2022-11-13 Jakub Jelinek * decl.cc (grokdeclarator): Implement CWG2635 - Constrained structured bindings. Diagnose constrained auto type. * g++.dg/cpp2a/decomp5.C: New test. * g++.dg/cpp2a/concepts-placeholder7.C: Adjust expected diagnostics. * g++.dg/cpp2a/concepts-placeholder8.C: Likewise. --- gcc/cp/decl.cc.jj 2022-11-11 17:14:33.103869977 +0100 +++ gcc/cp/decl.cc 2022-11-12 12:13:52.217239729 +0100 @@ -12660,7 +12660,8 @@ grokdeclarator (const cp_declarator *dec gcc_unreachable (); } if (TREE_CODE (type) != TEMPLATE_TYPE_PARM - || TYPE_IDENTIFIER (type) != auto_identifier) + || TYPE_IDENTIFIER (type) != auto_identifier + || PLACEHOLDER_TYPE_CONSTRAINTS_INFO (type)) { if (type != error_mark_node) { --- gcc/testsuite/g++.dg/cpp2a/decomp5.C.jj 2022-11-12 12:17:21.024392082 +0100 +++ gcc/testsuite/g++.dg/cpp2a/decomp5.C 2022-11-12 12:20:00.700214521 +0100 @@ -0,0 +1,20 @@ +// CWG2635 - Constrained structured bindings +// { dg-do compile { target c++20 } } + +namespace std { + template struct tuple_size; + template struct tuple_element; +} + +struct A { + int i; + A(int x) : i(x) {} + template int& get() { return i; } +}; + +template<> struct std::tuple_size { static const int value = 2; }; +template struct std::tuple_element { using type = int; }; + +template concept C = true; +C auto [x, y] = A{1}; // { dg-error "structured binding declaration cannot have type 'auto \\\[requires ::C<, >\\\]'" } + // { dg-message "type must be cv-qualified 'auto' or reference to cv-qualified 'auto'" "" { target *-*-* } .-1 } --- gcc/testsuite/g++.dg/cpp2a/concepts-placeholder7.C.jj 2021-04-06 23:49:08.288882716 +0200 +++ gcc/testsuite/g++.dg/cpp2a/concepts-placeholder7.C 2022-11-13 12:17:38.570047510 +0100 @@ -7,16 +7,16 @@ template void f() { int x[] = {1,2}; int y[] = {3}; - C1 auto [a,b] = x; - C1 auto [c] = y; // { dg-error "constraints" } + C1 auto [a,b] = x; // { dg-error "structured binding declaration cannot have type 'auto \\\[requires ::C1<, >\\\]'" } + C1 auto [c] = y; // { dg-error "structured binding declaration cannot have type 'auto \\\[requires ::C1<, >\\\]'" } } template void g() { T x[] = {1,2}; T y[] = {3}; - C1 auto [a,b] = x; - C1 auto [c] = y; // { dg-error "constraints" } + C1 auto [a,b] = x; // { dg-error "structured binding declaration cannot have type 'auto \\\[requires ::C1<, >\\\]'" } + C1 auto [c] = y; // { dg-error "structured binding declaration cannot have type 'auto \\\[requires ::C1<, >\\\]'" } } template void g(); @@ -27,6 +27,6 @@ struct S { int a, b; } s; template void h() { - const C2 auto& [a, b] = s; + const C2 auto& [a, b] = s; // { dg-error "structured binding declaration cannot have type 'const auto \\\[requires ::C2<, >\\\]'" } } template void h(); --- gcc/testsuite/g++.dg/cpp2a/concepts-placeholder8.C.jj 2021-04-06 23:49:08.288882716 +0200 +++ gcc/testsuite/g++.dg/cpp2a/concepts-placeholder8.C 2022-11-13 12:19:17.034684881 +0100 @@ -5,6 +5,6 @@ template concept is_const = __ void f() { int x[] = {1,2}; const int y[] = {3}; - const is_const auto [a,b] = x; // { dg-error "constraints" } - const is_const auto [c] = y; + const is_const auto [a,b] = x; // { dg-error "structured binding declaration cannot have type 'const auto \\\[requires ::is_const<, >\\\]'" } + const is_const auto [c] = y; // { dg-error "structured binding declaration cannot have type 'const auto \\\[requires ::is_const<, >\\\]'" } } Jakub