re PR c/51321 (__builtin_types_compatible_p (any_type_t[1][], any_other_type_t) crash...

2011-11-30  Andrew Pinski  <apinski@cavium.com>

	PR c/51321
	* c-parser.c (c_parser_postfix_expression): Check groktypename results
	before looking at the main variant.

2011-11-30  Andrew Pinski  <apinski@cavium.com>

	* gcc.dg/pr51321.c: New testcase.

From-SVN: r181857

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6acc6af676d1e169b5b1cb755ea243d66e34a2fb..f225378f42c8b6cc72d8421b0212f4c7278c59a0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-30  Andrew Pinski  <apinski@cavium.com>
+
+       PR c/51321
+       * c-parser.c (c_parser_postfix_expression): Check groktypename results
+       before looking at the main variant.
+
 2011-11-30  Jakub Jelinek  <jakub@redhat.com>
 
        PR rtl-optimization/48721

diff --git a/gcc/c-parser.c b/gcc/c-parser.c
index b88b11fc4302b0cafea5285cb19a30daf6e0db08..e227137bfb09f28d0a0406ee18e613eb5186bf3f 100644 (file)
--- a/gcc/c-parser.c
+++ b/gcc/c-parser.c
@@ -6568,9 +6568,16 @@ c_parser_postfix_expression (c_parser *parser)
                                     "expected %<)%>");
          {
            tree e1, e2;
+           e1 = groktypename (t1, NULL, NULL);
+           e2 = groktypename (t2, NULL, NULL);
+           if (e1 == error_mark_node || e2 == error_mark_node)
+             {
+               expr.value = error_mark_node;
+               break;
+             }
 
-           e1 = TYPE_MAIN_VARIANT (groktypename (t1, NULL, NULL));
-           e2 = TYPE_MAIN_VARIANT (groktypename (t2, NULL, NULL));
+           e1 = TYPE_MAIN_VARIANT (e1);
+           e2 = TYPE_MAIN_VARIANT (e2);
 
            expr.value
              = comptypes (e1, e2) ? integer_one_node : integer_zero_node;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a47925bec9d1ec63173966040dd68a9ec6e6897e..67312597c3493d1443e6f7ca248a901995f08c98 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-30  Andrew Pinski  <apinski@cavium.com>
+
+       * gcc.dg/pr51321.c: New testcase.
+
 2011-11-30  Jakub Jelinek  <jakub@redhat.com>
 
        PR rtl-optimization/48721

diff --git a/gcc/testsuite/gcc.dg/pr51321.c b/gcc/testsuite/gcc.dg/pr51321.c
new file mode 100644 (file)
index 0000000..0e836cf
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr51321.c
@@ -0,0 +1,7 @@
+/* { dg-do compile } */
+int main ()
+{
+  return (__builtin_types_compatible_p (char[1][], char[1][1])); /* { dg-error "array type has incomplete element type" } */
+}
+
+