From: Jason Merrill <jason@redhat.com>
Date: Tue, 9 Jun 2015 16:56:12 +0000 (-0400)
Subject: DR 1467 PR c++/51747
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=34f42d7bf400ba0facaa38ee9fee21b639d28146;p=gcc.git

DR 1467 PR c++/51747

	DR 1467
	PR c++/51747
	* typeck2.c (digest_init_r): Replace previous change with
	gcc_unreachable.

From-SVN: r224289
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 089f693af80..35a13457b26 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2015-06-09  Jason Merrill  <jason@redhat.com>
 
+	DR 1467
+	PR c++/51747
+	* typeck2.c (digest_init_r): Replace previous change with
+	gcc_unreachable.
+
 	PR c++/66387
 	* semantics.c (process_outer_var_ref): Make sure the value is
 	actually constant before returning it.
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index b077f0273d1..709875c71e1 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1089,6 +1089,7 @@ digest_init_r (tree type, tree init, bool nested, int flags,
 	      || TREE_CODE (type) == UNION_TYPE
 	      || TREE_CODE (type) == COMPLEX_TYPE);
 
+#ifdef ENABLE_CHECKING
   /* "If T is a class type and the initializer list has a single
      element of type cv U, where U is T or a class derived from T,
      the object is initialized from that element."  */
@@ -1099,8 +1100,10 @@ digest_init_r (tree type, tree init, bool nested, int flags,
     {
       tree elt = CONSTRUCTOR_ELT (init, 0)->value;
       if (reference_related_p (type, TREE_TYPE (elt)))
-	init = elt;
+	/* We should have fixed this in reshape_init.  */
+	gcc_unreachable ();
     }
+#endif
 
   if (BRACE_ENCLOSED_INITIALIZER_P (init)
       && !TYPE_NON_AGGREGATE_CLASS (type))