public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/autopar_devel] c++: Make braced-init-list as template arg work with aggr init [PR95369]
@ 2020-08-22 22:07 Giuliano Belinassi
0 siblings, 0 replies; only message in thread
From: Giuliano Belinassi @ 2020-08-22 22:07 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:9beccc2271b099135542595f58db622e17be608b
commit 9beccc2271b099135542595f58db622e17be608b
Author: Marek Polacek <polacek@redhat.com>
Date: Fri Jun 5 14:22:35 2020 -0400
c++: Make braced-init-list as template arg work with aggr init [PR95369]
Barry pointed out to me that our braced-init-list as a template-argument
extension doesn't work as expected when we aggregate-initialize. Since
aggregate list-initialization is a user-defined conversion sequence, we
allow it as part of a converted constant expression.
Co-authored-by: Jason Merrill <jason@redhat.com>
gcc/cp/ChangeLog:
PR c++/95369
* call.c (build_converted_constant_expr_internal): Allow
list-initialization.
gcc/testsuite/ChangeLog:
PR c++/95369
* g++.dg/cpp2a/nontype-class38.C: New test.
Diff:
---
gcc/cp/call.c | 4 +++-
gcc/testsuite/g++.dg/cpp2a/nontype-class38.C | 30 ++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 2b393f96e5b..3c97b9846e2 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4348,7 +4348,7 @@ build_converted_constant_expr_internal (tree type, tree expr,
and where the reference binding (if any) binds directly. */
for (conversion *c = conv;
- conv && c->kind != ck_identity;
+ c && c->kind != ck_identity;
c = next_conversion (c))
{
switch (c->kind)
@@ -4356,6 +4356,8 @@ build_converted_constant_expr_internal (tree type, tree expr,
/* A conversion function is OK. If it isn't constexpr, we'll
complain later that the argument isn't constant. */
case ck_user:
+ /* List-initialization is OK. */
+ case ck_aggr:
/* The lvalue-to-rvalue conversion is OK. */
case ck_rvalue:
/* Array-to-pointer and function-to-pointer. */
diff --git a/gcc/testsuite/g++.dg/cpp2a/nontype-class38.C b/gcc/testsuite/g++.dg/cpp2a/nontype-class38.C
new file mode 100644
index 00000000000..5b440fd1c9e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/nontype-class38.C
@@ -0,0 +1,30 @@
+// PR c++/95369
+// { dg-do compile { target c++20 } }
+
+struct S {
+ int a;
+ int b;
+};
+
+struct W {
+ int i;
+ S s;
+};
+
+template <S p>
+void fnc()
+{
+}
+
+template<S s> struct X { };
+template<W w> struct Y { };
+
+void f()
+{
+ fnc<{ .a = 10, .b = 20 }>();
+ fnc<{ 10, 20 }>();
+ X<{ .a = 1, .b = 2 }> x;
+ X<{ 1, 2 }> x2;
+ // Brace elision is likely to be allowed.
+ Y<{ 1, 2, 3 }> x3;
+}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-08-22 22:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-22 22:07 [gcc/devel/autopar_devel] c++: Make braced-init-list as template arg work with aggr init [PR95369] Giuliano Belinassi
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).