From: Patrick Palka <patrick@parcs.ath.cx>
To: gcc-patches@gcc.gnu.org
Cc: jason@redhat.com, Patrick Palka <patrick@parcs.ath.cx>
Subject: [PATCH] Fix PR c++/70332 (ICE due to aggregate initialization of NSDMI)
Date: Tue, 22 Mar 2016 21:40:00 -0000 [thread overview]
Message-ID: <1458682553-20882-1-git-send-email-patrick@parcs.ath.cx> (raw)
With c++14 an NSDMI no longer makes a class type non-aggregate so it's
possible to perform aggregate initialization on a class that has an
NSDMI, but tsubst_copy() currently ICEs on a use of 'this' in such
a situation.
This patch makes tsubst_copy() handle a use of 'this' in an NSDMI as
part of an aggregate initialization. In that case current_class_ref
will be a PLACEHOLDER_EXPR (as set by get_nsdmi()) and this
PLACEHOLDER_EXPR will later get resolved to the true object by
replace_placeholders().
Does this patch look OK to commit after testing?
gcc/cp/ChangeLog:
PR c++/70332
* pt.c (tsubst_copy) [PARM_DECL]: Handle the use of 'this' in an
NSDMI that's part of an aggregrate initialization.
gcc/testsuite/ChangeLog:
PR c++/70332
* g++.dg/cpp1y/nsdmi-aggr5.C: New test.
---
gcc/cp/pt.c | 20 ++++++++++++++++----
gcc/testsuite/g++.dg/cpp1y/nsdmi-aggr5.C | 24 ++++++++++++++++++++++++
2 files changed, 40 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/cpp1y/nsdmi-aggr5.C
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index ebfc45b..49ef9d3 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -13878,10 +13878,22 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl)
if (r == NULL_TREE)
{
/* We get here for a use of 'this' in an NSDMI. */
- if (DECL_NAME (t) == this_identifier
- && current_function_decl
- && DECL_CONSTRUCTOR_P (current_function_decl))
- return current_class_ptr;
+ if (DECL_NAME (t) == this_identifier)
+ {
+ /* We're processing an NSDMI as part of a constructor call. */
+ if (current_function_decl
+ && DECL_CONSTRUCTOR_P (current_function_decl))
+ return current_class_ptr;
+
+ /* Or as part of an aggregate initialization. */
+ if (cp_unevaluated_operand == 0
+ && current_class_ref
+ && TREE_CODE (current_class_ref) == PLACEHOLDER_EXPR)
+ {
+ gcc_assert (cxx_dialect >= cxx14);
+ return current_class_ptr;
+ }
+ }
/* This can happen for a parameter name used later in a function
declaration (such as in a late-specified return type). Just
diff --git a/gcc/testsuite/g++.dg/cpp1y/nsdmi-aggr5.C b/gcc/testsuite/g++.dg/cpp1y/nsdmi-aggr5.C
new file mode 100644
index 0000000..fe377c3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/nsdmi-aggr5.C
@@ -0,0 +1,24 @@
+// PR c++/70332
+// { dg-do run { target c++14 } }
+
+template <class T>
+struct C
+{
+ T m;
+ T *n = &m;
+};
+
+C<int> c { };
+
+int
+main ()
+{
+ *c.n = 5;
+ if (c.m != 5)
+ __builtin_abort ();
+
+ C<int> d { 10 };
+ *d.n = *d.n + 1;
+ if (d.m != 11)
+ __builtin_abort ();
+}
--
2.8.0.rc3.27.gade0865
next reply other threads:[~2016-03-22 21:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-22 21:40 Patrick Palka [this message]
2016-03-22 22:33 ` Jason Merrill
2016-03-22 22:45 ` Patrick Palka
2016-03-23 1:33 ` Patrick Palka
2016-03-23 13:05 ` Jason Merrill
2016-03-23 13:25 ` Patrick Palka
2016-03-23 13:52 ` 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=1458682553-20882-1-git-send-email-patrick@parcs.ath.cx \
--to=patrick@parcs.ath.cx \
--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).