diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9f6ae5e1e1a6..53376ae27bb4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/69915
+	* tree.c (build_vector_from_ctor): Fix handling of VECTOR_CST
+	elements.
+
 2016-02-24  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	PR rtl-optimization/69886
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 710dd11d7704..5b758dc879f4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/69915
+	* gcc.dg/pr69915.c: New test.
+
 2016-02-24  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	PR rtl-optimization/69886
diff --git a/gcc/testsuite/gcc.dg/pr69915.c b/gcc/testsuite/gcc.dg/pr69915.c
new file mode 100644
index 000000000000..4c60c59d4004
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr69915.c
@@ -0,0 +1,15 @@
+/* PR middle-end/69915 */
+/* { dg-do compile } */
+/* { dg-options "-O -ftracer" } */
+
+typedef unsigned short V __attribute__ ((vector_size (32)));
+
+unsigned
+foo (unsigned x, unsigned c, V *p)
+{
+  V v = *p;
+  if (c < 360)
+    v = (V) { 0 };
+  v *= (V) { x };
+  return v[1];
+}
diff --git a/gcc/tree.c b/gcc/tree.c
index a265623bc783..b8333d45d047 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -1749,7 +1749,7 @@ build_vector_from_ctor (tree type, vec<constructor_elt, va_gc> *v)
       else
 	vec[pos++] = value;
     }
-  for (; idx < TYPE_VECTOR_SUBPARTS (type); ++idx)
+  while (pos < TYPE_VECTOR_SUBPARTS (type))
     vec[pos++] = build_zero_cst (TREE_TYPE (type));
 
   return build_vector (type, vec);