Fix vect-reduc-or_[12].c changes in r257022

I'd somehow thought that the dump lines in these two tests were already
correctly guarded, but they weren't.

2018-01-25  Richard Sandiford  <richard.sandiford@linaro.org>

gcc/testsuite/
	* gcc.dg/vect/vect-reduc-or_1.c: Require whole_vector_shift for
	the shift dump line.
	* gcc.dg/vect/vect-reduc-or_2.c: Likewise.

From-SVN: r257044

gcc/testsuite/ChangeLog

+2018-01-25  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* gcc.dg/vect/vect-reduc-or_1.c: Require whole_vector_shift for
+	the shift dump line.
+	* gcc.dg/vect/vect-reduc-or_2.c: Likewise.
+
 2018-01-24  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	PR target/81550

gcc/testsuite/gcc.dg/vect/vect-reduc-or_1.c

@@ -45,5 +45,5 @@ main (unsigned char argc, char **argv)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump "Reduce using vector shifts" "vect" { target { ! vect_logical_reduc } } } } */
+/* { dg-final { scan-tree-dump "Reduce using vector shifts" "vect" { target { whole_vector_shift && { ! vect_logical_reduc } } } } } */
 /* { dg-final { scan-tree-dump "Reduce using direct vector reduction" "vect" { target vect_logical_reduc } } } */

gcc/testsuite/gcc.dg/vect/vect-reduc-or_2.c

@@ -44,5 +44,5 @@ main (unsigned char argc, char **argv)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump "Reduce using vector shifts" "vect" { target { ! vect_logical_reduc } } } } */
+/* { dg-final { scan-tree-dump "Reduce using vector shifts" "vect" { target { whole_vector_shift && { ! vect_logical_reduc } } } } } */
 /* { dg-final { scan-tree-dump "Reduce using direct vector reduction" "vect" { target vect_logical_reduc } } } */