From: Paolo Carlini <paolo.carlini@oracle.com>
To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
Cc: Jason Merrill <jason@redhat.com>
Subject: [C++ Patch] PR 65815
Date: Fri, 22 May 2015 19:57:00 -0000 [thread overview]
Message-ID: <555F7971.4060704@oracle.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 379 bytes --]
Hi,
surprisingly, for NSDMIs we don't use reshape_init and we end-up
rejecting simple testcases like the below. It seems clear to me that we
should - consistently with the comment preceding digest_init too - but
I'm not 100% sure that digest_nsdmi_init is the best place for that.
Anyway, the below passes testing on x86_64-linux.
Thanks!
Paolo.
/////////////////////////
[-- Attachment #2: CL_65815 --]
[-- Type: text/plain, Size: 399 bytes --]
/cp
2015-05-22 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/65815
* typeck2.c (digest_nsdmi_init): On aggregates use reshape_init;
take a type, not a decl, as first argument.
* parser.c (cp_parser_late_parse_one_default_arg): Adjust call.
* init.c (get_nsdmi): Likewise.
/testsuite
2015-05-22 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/65815
* g++.dg/cpp0x/nsdmi-aggr1.C: New.
[-- Attachment #3: patch_65815 --]
[-- Type: text/plain, Size: 2426 bytes --]
Index: cp/init.c
===================================================================
--- cp/init.c (revision 223580)
+++ cp/init.c (working copy)
@@ -564,7 +564,7 @@ get_nsdmi (tree member, bool in_ctor)
tf_warning_or_error, member, /*function_p=*/false,
/*integral_constant_expression_p=*/false));
- init = digest_nsdmi_init (member, init);
+ init = digest_nsdmi_init (TREE_TYPE (member), init);
}
else
{
Index: cp/parser.c
===================================================================
--- cp/parser.c (revision 223580)
+++ cp/parser.c (working copy)
@@ -24278,7 +24283,7 @@ cp_parser_late_parse_one_default_arg (cp_parser *p
parsed_arg = check_default_argument (parmtype, parsed_arg,
tf_warning_or_error);
else
- parsed_arg = digest_nsdmi_init (decl, parsed_arg);
+ parsed_arg = digest_nsdmi_init (TREE_TYPE (decl), parsed_arg);
}
/* If the token stream has not been completely used up, then
Index: cp/typeck2.c
===================================================================
--- cp/typeck2.c (revision 223580)
+++ cp/typeck2.c (working copy)
@@ -1159,16 +1159,18 @@ digest_init_flags (tree type, tree init, int flags
return digest_init_r (type, init, false, flags, tf_warning_or_error);
}
-/* Process the initializer INIT for an NSDMI DECL (a FIELD_DECL). */
+/* Process the initializer INIT for an NSDMI decl of type TYPE. */
+
tree
-digest_nsdmi_init (tree decl, tree init)
+digest_nsdmi_init (tree type, tree init)
{
- gcc_assert (TREE_CODE (decl) == FIELD_DECL);
-
int flags = LOOKUP_IMPLICIT;
if (DIRECT_LIST_INIT_P (init))
flags = LOOKUP_NORMAL;
- init = digest_init_flags (TREE_TYPE (decl), init, flags);
+ if (BRACE_ENCLOSED_INITIALIZER_P (init)
+ && CP_AGGREGATE_TYPE_P (type))
+ init = reshape_init (type, init, tf_warning_or_error);
+ init = digest_init_flags (type, init, flags);
if (TREE_CODE (init) == TARGET_EXPR)
/* This represents the whole initialization. */
TARGET_EXPR_DIRECT_INIT_P (init) = true;
Index: testsuite/g++.dg/cpp0x/nsdmi-aggr1.C
===================================================================
--- testsuite/g++.dg/cpp0x/nsdmi-aggr1.C (revision 0)
+++ testsuite/g++.dg/cpp0x/nsdmi-aggr1.C (working copy)
@@ -0,0 +1,10 @@
+// PR c++/65815
+// { dg-do compile { target c++11 } }
+
+struct array {
+ int data [2];
+};
+
+struct X {
+ array a = { 1, 2 };
+};
next reply other threads:[~2015-05-22 18:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-22 19:57 Paolo Carlini [this message]
2015-06-08 15:53 ` [Ping] " Paolo Carlini
2015-06-08 16:51 ` Jason Merrill
2015-06-08 21:22 ` Paolo Carlini
2015-06-08 23:20 ` Paolo Carlini
2015-06-09 0:58 ` Paolo Carlini
2015-06-09 14:05 ` Jason Merrill
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=555F7971.4060704@oracle.com \
--to=paolo.carlini@oracle.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jason@redhat.com \
/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).