From cc77228cbb0c4d81ab5ba569d8593e696cb0f520 Mon Sep 17 00:00:00 2001 From: glisse Date: Fri, 22 May 2015 20:59:27 +0000 Subject: [PATCH] 2015-05-22 Marc Glisse gcc/ * convert.c (convert_to_integer, convert_to_vector): Include the types in the error message. gcc/testsuite/ * gcc.dg/simd-1.c: Update to the new message. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223590 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/convert.c | 8 ++++++-- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/simd-1.c | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ceb9444765f..da465838256 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2015-05-22 Marc Glisse + * convert.c (convert_to_integer, convert_to_vector): Include the + types in the error message. + +2015-05-22 Marc Glisse + * match.pd ((x | y) & ~x -> y & ~x, (x & y) | ~x -> y | ~x): New simplifications. diff --git a/gcc/convert.c b/gcc/convert.c index 142e82a3c8f..0aa58ab0547 100644 --- a/gcc/convert.c +++ b/gcc/convert.c @@ -920,7 +920,9 @@ convert_to_integer (tree type, tree expr) case VECTOR_TYPE: if (!tree_int_cst_equal (TYPE_SIZE (type), TYPE_SIZE (TREE_TYPE (expr)))) { - error ("can%'t convert between vector values of different size"); + error ("can%'t convert a vector of type %qT" + " to type %qT which has different size", + TREE_TYPE (expr), type); return error_mark_node; } return build1 (VIEW_CONVERT_EXPR, type, expr); @@ -1004,7 +1006,9 @@ convert_to_vector (tree type, tree expr) case VECTOR_TYPE: if (!tree_int_cst_equal (TYPE_SIZE (type), TYPE_SIZE (TREE_TYPE (expr)))) { - error ("can%'t convert between vector values of different size"); + error ("can%'t convert a value of type %qT" + " to vector type %qT which has different size", + TREE_TYPE (expr), type); return error_mark_node; } return build1 (VIEW_CONVERT_EXPR, type, expr); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8d480a3a21f..63ebd45dc98 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2015-05-22 Marc Glisse + * gcc.dg/simd-1.c: Update to the new message. + +2015-05-22 Marc Glisse + * gcc.dg/nand.c: New testcase. 2015-05-22 Sandra Loosemore diff --git a/gcc/testsuite/gcc.dg/simd-1.c b/gcc/testsuite/gcc.dg/simd-1.c index e00e1dd6931..ff45c9c567e 100644 --- a/gcc/testsuite/gcc.dg/simd-1.c +++ b/gcc/testsuite/gcc.dg/simd-1.c @@ -45,7 +45,7 @@ hanneke () foo = (typeof (foo)) foo2; /* Casted assignment between scalar and SIMD of different size. */ - foo1 = (typeof (foo1)) foo2; /* { dg-error "can't convert between vector values of different size" } */ + foo1 = (typeof (foo1)) foo2; /* { dg-error "can't convert a vector of type" } */ /* Operators on compatible SIMD types. */ a += b + b; -- 2.11.4.GIT