public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Patrick Palka <ppalka@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-3997] c++: __is_trivially_xible and multi-arg aggr paren init [PR102535]
Date: Thu, 30 Sep 2021 21:51:58 +0000 (GMT)	[thread overview]
Message-ID: <20210930215158.214033857C5B@sourceware.org> (raw)

https://gcc.gnu.org/g:9845c52db38f15740861435f38f7e5ad8a8de2ec

commit r12-3997-g9845c52db38f15740861435f38f7e5ad8a8de2ec
Author: Patrick Palka <ppalka@redhat.com>
Date:   Thu Sep 30 17:34:23 2021 -0400

    c++: __is_trivially_xible and multi-arg aggr paren init [PR102535]
    
    is_xible_helper assumes only 0- and 1-argument ctors can be trivial, but
    C++20 aggregate paren init means multi-arg ctors can now be trivial too.
    This patch relaxes the relevant early exit check accordingly.
    
            PR c++/102535
    
    gcc/cp/ChangeLog:
    
            * method.c (is_xible_helper): Don't exit early for multi-arg
            ctors in C++20.
    
    gcc/testsuite/ChangeLog:
    
            * g++.dg/ext/is_trivially_constructible7.C: New test.

Diff:
---
 gcc/cp/method.c                                        |  4 +++-
 gcc/testsuite/g++.dg/ext/is_trivially_constructible7.C | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 3c3495227ce..c38912a7ce9 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -2094,8 +2094,10 @@ is_xible_helper (enum tree_code code, tree to, tree from, bool trivial)
   tree expr;
   if (code == MODIFY_EXPR)
     expr = assignable_expr (to, from);
-  else if (trivial && from && TREE_CHAIN (from))
+  else if (trivial && from && TREE_CHAIN (from)
+	   && cxx_dialect < cxx20)
     return error_mark_node; // only 0- and 1-argument ctors can be trivial
+			    // before C++20 aggregate paren init
   else if (TREE_CODE (to) == ARRAY_TYPE && !TYPE_DOMAIN (to))
     return error_mark_node; // can't construct an array of unknown bound
   else
diff --git a/gcc/testsuite/g++.dg/ext/is_trivially_constructible7.C b/gcc/testsuite/g++.dg/ext/is_trivially_constructible7.C
new file mode 100644
index 00000000000..f6fbf8f2d9e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_trivially_constructible7.C
@@ -0,0 +1,17 @@
+// PR c++/102535
+// Verify __is_trivially_constructible works with multi-arg paren init of
+// aggrs.
+
+struct A { int x; };
+struct B { float y; };
+struct C { char z; };
+struct D { A a; B b; C c; };
+
+extern int n[1 + __is_trivially_constructible(D, A)];
+extern int n[1 + __is_trivially_constructible(D, A, B)];
+extern int n[1 + __is_trivially_constructible(D, A, B, C)];
+#if __cpp_aggregate_paren_init
+extern int n[1 + true];
+#else
+extern int n[1 + false];
+#endif


                 reply	other threads:[~2021-09-30 21:51 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210930215158.214033857C5B@sourceware.org \
    --to=ppalka@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).