From: Marc Glisse <marc.glisse@inria.fr>
Date: Mon, 15 Oct 2012 14:38:04 +0000 (+0200)
Subject: re PR middle-end/54915 (ICE: verify_gimple failed: type mismatch in vector permute... 
X-Git-Tag: misc/gccgo-go1_1_2~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=895e8371269deae98b75c6784cd0def3d8ff4446;p=thirdparty%2Fgcc.git

re PR middle-end/54915 (ICE: verify_gimple failed: type mismatch in vector permute expression)

2012-10-15  Marc Glisse  <marc.glisse@inria.fr>

	PR tree-optimization/54915

gcc/
	* tree-ssa-forwprop.c (simplify_vector_constructor): Check
	argument's type.

gcc/testsuite/
	* gcc.dg/tree-ssa/pr54915.c: New testcase.

From-SVN: r192461
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2905d694f77d..227a60f577da 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-15  Marc Glisse  <marc.glisse@inria.fr>
+
+	PR tree-optimization/54915
+	* tree-ssa-forwprop.c (simplify_vector_constructor): Check
+	argument's type.
+
 2012-10-15  Richard Biener  <rguenther@suse.de>
 
 	* data-streamer.h (bp_pack_string_with_length): New function.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 07a052da7290..74e7b1c3fd62 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-15  Marc Glisse  <marc.glisse@inria.fr>
+
+	PR tree-optimization/54915
+	* gcc.dg/tree-ssa/pr54915.c: New testcase.
+
 2012-10-15  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/54920
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr54915.c b/gcc/testsuite/gcc.dg/tree-ssa/pr54915.c
new file mode 100644
index 000000000000..1e11df198103
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr54915.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+typedef double v2df __attribute__ ((__vector_size__ (16)));
+typedef double v4df __attribute__ ((__vector_size__ (32)));
+
+void f (v2df *ret, v4df* xp)
+{
+  v4df x = *xp;
+  v2df xx = { x[2], x[3] };
+  *ret = xx;
+}
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index eb1af4e9e456..b6c5654da011 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -2840,6 +2840,8 @@ simplify_vector_constructor (gimple_stmt_iterator *gsi)
 	{
 	  if (TREE_CODE (ref) != SSA_NAME)
 	    return false;
+	  if (!useless_type_conversion_p (type, TREE_TYPE (ref)))
+	    return false;
 	  orig = ref;
 	}
       if (TREE_INT_CST_LOW (TREE_OPERAND (op1, 1)) != elem_size)