2011-03-14 Richard Guenther <rguenther@suse.de>

	PR middle-end/48098
	* tree.c (build_vector_from_val): Adjust assert to requirements
	and reality.

	* gcc.dg/torture/pr48098.c: New testcase.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170934 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bedecef..086d1ba 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-14  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/48098
+       * tree.c (build_vector_from_val): Adjust assert to requirements
+       and reality.
+
 2011-03-14  Jakub Jelinek  <jakub@redhat.com>
 
        PR bootstrap/48102

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0ea0946..2356b1d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-14  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/48098
+       * gcc.dg/torture/pr48098.c: New testcase.
+
 2011-03-12  Peter Bergner  <bergner@vnet.ibm.com>
 
        PR target/48053

diff --git a/gcc/testsuite/gcc.dg/torture/pr48098.c b/gcc/testsuite/gcc.dg/torture/pr48098.c
new file mode 100644 (file)
index 0000000..cd72939
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr48098.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+
+void
+foo (int n)
+{
+  static char *__restrict *p;
+  int i;
+  p = __builtin_malloc (n);
+  for (i = 0; i < n; i++)
+    p[i] = 0;
+}
+

diff --git a/gcc/tree.c b/gcc/tree.c
index be46990..405b549 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -1376,8 +1376,14 @@ build_vector_from_val (tree vectype, tree sc)
   if (sc == error_mark_node)
     return sc;
 
-  gcc_assert (useless_type_conversion_p (TREE_TYPE (sc),
-                                        TREE_TYPE (vectype)));
+  /* Verify that the vector type is suitable for SC.  Note that there
+     is some inconsistency in the type-system with respect to restrict
+     qualifications of pointers.  Vector types always have a main-variant
+     element type and the qualification is applied to the vector-type.
+     So TREE_TYPE (vector-type) does not return a properly qualified
+     vector element-type.  */
+  gcc_checking_assert (types_compatible_p (TYPE_MAIN_VARIANT (TREE_TYPE (sc)),
+                                          TREE_TYPE (vectype)));
 
   v = VEC_alloc (constructor_elt, gc, nunits);
   for (i = 0; i < nunits; ++i)