From: Marc Glisse <marc.glisse@inria.fr>
Date: Mon, 6 May 2013 21:11:24 +0000 (+0200)
Subject: typeck.c (cp_build_binary_op): Call save_expr before build_vector_from_val.
X-Git-Tag: releases/gcc-4.9.0~6021
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6698175d1591c25041f3979a5c01ef5f81e2f4ff;p=thirdparty%2Fgcc.git

typeck.c (cp_build_binary_op): Call save_expr before build_vector_from_val.

2013-05-06  Marc Glisse  <marc.glisse@inria.fr>

gcc/cp/
	* typeck.c (cp_build_binary_op): Call save_expr before
	build_vector_from_val.

gcc/testsuite/
	* c-c++-common/vector-scalar-2.c: New testcase.

From-SVN: r198648
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 387f44aacf69..21c4e395b450 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-06  Marc Glisse  <marc.glisse@inria.fr>
+
+	* typeck.c (cp_build_binary_op): Call save_expr before
+	build_vector_from_val.
+
 2013-05-06  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/57183
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index b761dd5bd0e5..2d9711b96a39 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -3972,6 +3972,7 @@ cp_build_binary_op (location_t location,
             return error_mark_node;
           case stv_firstarg:
             {
+	      op0 = save_expr (op0);
               op0 = convert (TREE_TYPE (type1), op0);
               op0 = build_vector_from_val (type1, op0);
               type0 = TREE_TYPE (op0);
@@ -3981,6 +3982,7 @@ cp_build_binary_op (location_t location,
             }
           case stv_secondarg:
             {
+	      op1 = save_expr (op1);
               op1 = convert (TREE_TYPE (type0), op1);
               op1 = build_vector_from_val (type0, op1);
               type1 = TREE_TYPE (op1);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 73d27cf62969..dc8c10e19db3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-06  Marc Glisse  <marc.glisse@inria.fr>
+
+	* c-c++-common/vector-scalar-2.c: New testcase.
+
 2013-05-06  Maxim Kuznetsov  <maks.kuznetsov@gmail.com>
 
 	* gcc.target/i386/asm-dialect-2.c: New testcase.
diff --git a/gcc/testsuite/c-c++-common/vector-scalar-2.c b/gcc/testsuite/c-c++-common/vector-scalar-2.c
new file mode 100644
index 000000000000..f624c4c751e9
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/vector-scalar-2.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-fdump-tree-gimple" } */
+
+typedef int veci __attribute__ ((vector_size (4 * sizeof (int))));
+
+int c;
+
+void f (veci *a)
+{
+  *a = *a + ++c;
+}
+
+/* { dg-final { scan-tree-dump-times " \\\+ 1" 1 "gimple" } } */
+/* { dg-final { cleanup-tree-dump "gimple" } } */