convert.c (convert_to_integer, [...]): Include the types in the error message.

2015-05-22  Marc Glisse  <marc.glisse@inria.fr>

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.

From-SVN: r223590

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ceb9444765fb4772d65e7d5cfbea97946b9645c8..da465838256de7e50ec40b644e2b20f302403551 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-22  Marc Glisse  <marc.glisse@inria.fr>
+
+       * convert.c (convert_to_integer, convert_to_vector): Include the
+       types in the error message.
+
 2015-05-22  Marc Glisse  <marc.glisse@inria.fr>
 
        * match.pd ((x | y) & ~x -> y & ~x, (x & y) | ~x -> y | ~x): New

diff --git a/gcc/convert.c b/gcc/convert.c
index 142e82a3c8f484888708d4ca527bb08bf13d9c92..0aa58ab0547a26b31d5429469a0573f1e4a7418b 100644 (file)
--- 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 8d480a3a21f11647e79261a5111fda851e3af11b..63ebd45dc9848e9c79e89daee626ff6675828a86 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-22  Marc Glisse  <marc.glisse@inria.fr>
+
+       * gcc.dg/simd-1.c: Update to the new message.
+
 2015-05-22  Marc Glisse  <marc.glisse@inria.fr>
 
        * gcc.dg/nand.c: New testcase.

diff --git a/gcc/testsuite/gcc.dg/simd-1.c b/gcc/testsuite/gcc.dg/simd-1.c
index e00e1dd693127a279c8ece1c812dfaf46037e8e0..ff45c9c567ed635eb6d4997103d11cd6a92e9415 100644 (file)
--- 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;