call.c (build_conditional_expr_1): Use cp_build_binary_op instead of directly calling...

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

gcc/cp/
	* call.c (build_conditional_expr_1): Use cp_build_binary_op
	instead of directly calling fold_build2.

gcc/testsuite/
	* g++.dg/ext/vector22.C: Uncomment working test.

From-SVN: r198988

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a398050745e8e436a8395c379d763ce4d9060b9f..ab2afd489787ca6056bf86cfbeb563cc6fef0a18 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-16  Marc Glisse  <marc.glisse@inria.fr>
+
+       * call.c (build_conditional_expr_1): Use cp_build_binary_op
+       instead of directly calling fold_build2.
+
 2013-05-16  Jason Merrill  <jason@redhat.com>
 
        * Make-lang.in (cc1plus$(exeext)): Use link mutex.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index bd8f531eea4ae38fd22890017972166fd0bbdc88..b09a87f4642ee57a3322da5a5aa310fb0852ec59 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4455,8 +4455,8 @@ build_conditional_expr_1 (tree arg1, tree arg2, tree arg3,
        }
 
       if (!COMPARISON_CLASS_P (arg1))
-       arg1 = fold_build2 (NE_EXPR, signed_type_for (arg1_type), arg1,
-                      build_zero_cst (arg1_type));
+       arg1 = cp_build_binary_op (input_location, NE_EXPR, arg1,
+                                  build_zero_cst (arg1_type), complain);
       return fold_build3 (VEC_COND_EXPR, arg2_type, arg1, arg2, arg3);
     }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c454367ddc70a6ad0e2574738a08cf13756fa956..d742559afa9fe555b09afa15ffe543b36fbb122a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-16  Marc Glisse  <marc.glisse@inria.fr>
+
+       * g++.dg/ext/vector22.C: Uncomment working test.
+
 2013-05-16  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/17410

diff --git a/gcc/testsuite/g++.dg/ext/vector22.C b/gcc/testsuite/g++.dg/ext/vector22.C
index 47f64e7e7a7f30fe0e450ef27ea77ce9ac289e9f..7c0279c68a858fd3efd67e13357b2bf544fae07a 100644 (file)
--- a/gcc/testsuite/g++.dg/ext/vector22.C
+++ b/gcc/testsuite/g++.dg/ext/vector22.C
@@ -11,7 +11,7 @@ void f(vec*a,vec*b){
 */
 void g(vec*a,vec*b){
   *a=(*a)?(*a<*a):-1;
-// *b=(*b)?-1:(*b<*b);
+  *b=(*b)?-1:(*b<*b);
 }
 void h(vec*a){
   *a=(~*a==5);