aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorAldy Hernandez <aldyh@redhat.com>2005-06-15 10:35:19 +0000
committerAldy Hernandez <aldyh@gcc.gnu.org>2005-06-15 10:35:19 +0000
commitf6d7e7d8c0a2d025da90575eb488603ca0d22ec7 (patch)
treecfb1e04f8f966fc10bfe54d42f6c8a47a3580fee /gcc/cp
parent5bed876a0279849a661718d5a63c741652a4ecae (diff)
downloadgcc-f6d7e7d8c0a2d025da90575eb488603ca0d22ec7.zip
gcc-f6d7e7d8c0a2d025da90575eb488603ca0d22ec7.tar.gz
gcc-f6d7e7d8c0a2d025da90575eb488603ca0d22ec7.tar.bz2
typeck.c (build_binary_op): Same.
* typeck.c (build_binary_op): Same. * testsuite/g++.dg/conversion/simd3.C: New. From-SVN: r100977
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/typeck.c9
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8a24049..996664a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-15 Aldy Hernandez <aldyh@redhat.com>
+
+ * typeck.c (build_binary_op): Same.
+ * testsuite/g++.dg/conversion/simd3.C: New.
+
2005-06-15 Nathan Sidwell <nathan@codesourcery.com>
PR c++/20678
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 3581ea2..58ba0798 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -3181,8 +3181,13 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
/* Vector arithmetic is only allowed when both sides are vectors. */
if (code0 == VECTOR_TYPE && code1 == VECTOR_TYPE)
{
- if (!tree_int_cst_equal (TYPE_SIZE (type0), TYPE_SIZE (type1)))
- error ("can't convert between vector values of different size");
+ if (!tree_int_cst_equal (TYPE_SIZE (type0), TYPE_SIZE (type1))
+ || !same_scalar_type_ignoring_signedness (TREE_TYPE (type0),
+ TREE_TYPE (type1)))
+ {
+ binary_op_error (code);
+ return error_mark_node;
+ }
arithmetic_types_p = 1;
}
}