From 947f720f7d7ca03f642e8682a97cb667bd343569 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Thu, 6 Dec 2012 19:54:25 +0100
Subject: [PATCH] re PR c++/55573 (ICE in adjust_temp_type, at
 cp/semantics.c:6454)

	PR c++/55573
	* semantics.c (adjust_temp_type): Handle VECTOR_CST.

	* g++.dg/cpp0x/constexpr-55573.C: New test.

From-SVN: r194262
---
 gcc/cp/ChangeLog                             |  5 +++++
 gcc/cp/semantics.c                           |  2 +-
 gcc/testsuite/ChangeLog                      |  5 +++++
 gcc/testsuite/g++.dg/cpp0x/constexpr-55573.C | 22 ++++++++++++++++++++
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-55573.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 96a88b92b19..23a0a9267dd 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-06  Marc Glisse  <marc.glisse@inria.fr>
+
+	PR c++/55573
+	* semantics.c (adjust_temp_type): Handle VECTOR_CST.
+
 2012-12-06  Jason Merrill  <jason@redhat.com>
 
 	PR c++/54947
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 53e849afbef..24832673386 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -6451,7 +6451,7 @@ adjust_temp_type (tree type, tree temp)
   /* Avoid wrapping an aggregate value in a NOP_EXPR.  */
   if (TREE_CODE (temp) == CONSTRUCTOR)
     return build_constructor (type, CONSTRUCTOR_ELTS (temp));
-  gcc_assert (SCALAR_TYPE_P (type));
+  gcc_assert (scalarish_type_p (type));
   return cp_fold_convert (type, temp);
 }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ce14c922f04..1912926e386 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/55573
+	* g++.dg/cpp0x/constexpr-55573.C: New test.
+
 2012-12-06  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/55137
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-55573.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-55573.C
new file mode 100644
index 00000000000..1988253008e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-55573.C
@@ -0,0 +1,22 @@
+// PR c++/55573
+// { dg-do compile }
+// { dg-options "-std=gnu++11" }
+
+template <typename T, int N>
+struct ExtVecTraits {
+  typedef T __attribute__((vector_size (N * sizeof (T)))) type;
+};
+
+template <typename T>
+using Vec4 = typename ExtVecTraits<T,4>::type;
+
+template <typename T>
+struct Rot3
+{
+  typedef Vec4<T> Vec;
+  Vec axis[3];
+  constexpr Rot3 (Vec4<T> ix, Vec4<T> iy, Vec4<T> iz) : axis {ix, iy, iz} {}
+};
+
+typedef Vec4<float> Vec;
+Rot3<float> r2 ((Vec) {0, 1, 0, 0}, (Vec){0, 0, 1, 0}, (Vec){1, 0, 0, 0});
-- 
2.30.2