aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorMarc Glisse <marc.glisse@inria.fr>2013-05-16 22:32:42 +0200
committerMarc Glisse <glisse@gcc.gnu.org>2013-05-16 20:32:42 +0000
commit749dee7e60df58dea8e780134c641a9f67b9fe18 (patch)
tree29ec54a8bec142308715ea163b64ba444a3f65b0 /gcc/cp
parent19db293ad5760f49869e5c23823598c98a30d0f8 (diff)
downloadgcc-749dee7e60df58dea8e780134c641a9f67b9fe18.zip
gcc-749dee7e60df58dea8e780134c641a9f67b9fe18.tar.gz
gcc-749dee7e60df58dea8e780134c641a9f67b9fe18.tar.bz2
call.c (build_conditional_expr_1): Use cp_build_binary_op instead of directly calling fold_build2.
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
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/call.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a398050..ab2afd4 100644
--- 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 bd8f531..b09a87f 100644
--- 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);
}