diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e2b9974a9c8..7c43598d843 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-07-06  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/66767
+	* tree-vect-loop-manip.c (vect_create_cond_for_align_checks):
+	Make sure to build the alignment test on a SSA name without
+	final alignment info valid only if the alignment test
+	evaluates to true.
+
 2015-07-06  Bernd Schmidt  <bernds@codesourcery.com>
 
 	PR target/66620
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index 58d2c7feeff..56314ed0773 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -2143,7 +2143,7 @@ vect_create_cond_for_align_checks (loop_vec_info loop_vinfo,
       bool negative = tree_int_cst_compare
 	(DR_STEP (STMT_VINFO_DATA_REF (stmt_vinfo)), size_zero_node) < 0;
       tree offset = negative
-	? size_int (-TYPE_VECTOR_SUBPARTS (vectype) + 1) : NULL_TREE;
+	? size_int (-TYPE_VECTOR_SUBPARTS (vectype) + 1) : size_zero_node;
 
       /* create: addr_tmp = (int)(address_of_first_vector) */
       addr_base =