From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 8 Dec 2012 03:31:25 +0000 (+0000)
Subject: 	PR c++/55419
X-Git-Tag: upstream/4.9.2~8661
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db54586c7fee2c767a4c51ca55bb9b1316c20bdd;p=platform%2Fupstream%2Flinaro-gcc.git

	PR c++/55419
	* tree.c (build_target_expr): Don't set TREE_CONSTANT.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194317 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cee5db6..78e7d40 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-07  Jason Merrill  <jason@redhat.com>
+
+	PR c++/55419
+	* tree.c (build_target_expr): Don't set TREE_CONSTANT.
+
 2012-12-07  Aldy Hernandez  <aldyh@redhat.com>
 
 	PR c++/55513
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index ca209eb..00fe53f 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -329,8 +329,6 @@ build_target_expr (tree decl, tree value, tsubst_flags_t complain)
      side-effects, then the optimizer should be able to get rid of
      whatever code is generated anyhow.  */
   TREE_SIDE_EFFECTS (t) = 1;
-  if (literal_type_p (type))
-    TREE_CONSTANT (t) = TREE_CONSTANT (value);
 
   return t;
 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist6.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist6.C
new file mode 100644
index 0000000..6b822a1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist6.C
@@ -0,0 +1,27 @@
+// PR c++/55419
+// { dg-options -std=c++11 }
+
+struct P
+{
+  P () = default;
+  explicit constexpr P (int x) : p (x) {}
+  int p;
+};
+
+struct Q
+{
+  constexpr Q () : q (0x7f) {}
+  int q;
+};
+
+struct R
+{
+  Q q;
+  P p;
+};
+
+void
+foo (R *x)
+{
+  *x = {};
+}