re PR c/53060 (Typo in build_binary_op for scalar-vector ops)

2012-04-23  Richard Guenther  <rguenther@suse.de>

	PR c/53060
	* c-typeck.c (build_binary_op): Fix typo.

	* gcc.dg/pr53060.c: New testcase.

From-SVN: r186696

gcc/ChangeLog

+2012-04-23  Richard Guenther  <rguenther@suse.de>
+
+	PR c/53060
+	* c-typeck.c (build_binary_op): Fix typo.
+
 2012-04-23  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimizations/52891
@@ -7,7 +12,8 @@
 
 2012-04-22  Jan Hubicka  <jh@suse.cz>
 
-	* tree-ssa-loop-ivopts.c (expr_invariant_in_loop_p): Bail out at NULL tree refs.
+	* tree-ssa-loop-ivopts.c (expr_invariant_in_loop_p): Bail out at NULL
+	tree refs.
 
 2012-04-22  Jan Hubicka  <jh@suse.cz>
 

gcc/c-typeck.c

@@ -9751,7 +9751,7 @@ build_binary_op (location_t location, enum tree_code code,
 	      sc = convert (TREE_TYPE (type0), sc);
 	      op1 = build_vector_from_val (type0, sc);
 	      if (!maybe_const)
-		op0 = c_wrap_maybe_const (op1, true);
+		op1 = c_wrap_maybe_const (op1, true);
 	      orig_type1 = type1 = TREE_TYPE (op1);
 	      code1 = TREE_CODE (type1);
 	      converted = 1;

gcc/testsuite/ChangeLog

+2012-04-23  Richard Guenther  <rguenther@suse.de>
+
+	PR c/53060
+	* gcc.dg/pr53060.c: New testcase.
+
 2012-04-23  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimizations/52891

gcc/testsuite/gcc.dg/pr53060.c

+/* { dg-do run } */
+
+extern void abort (void);
+
+int                     f(void) { return 2; }
+unsigned int            g(void) { return 5; }
+unsigned int            h = 1;
+
+typedef unsigned int vec __attribute__((vector_size(16)));
+
+vec i = { 1, 2, 3, 4};
+
+vec fv1(void) { return i + (h ? f() : g()); }
+vec fv2(void) { return (h ? f() : g()) + i; }
+
+int main()
+{
+  vec i, j;
+  j = fv1();
+  if (j[0] != 3) abort();
+  i = fv2();
+  if (i[0] != 3) abort();
+  return 0;
+}