From: Andrew Pinski <apinski@cavium.com>
Date: Wed, 30 Nov 2011 19:55:36 +0000 (+0000)
Subject: re PR c/51321 (__builtin_types_compatible_p (any_type_t[1][], any_other_type_t) crash... 
X-Git-Tag: releases/gcc-4.7.0~1862
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9abfe98649d444d324f707d25071bcd8f31282e8;p=thirdparty%2Fgcc.git

re PR c/51321 (__builtin_types_compatible_p (any_type_t[1][], any_other_type_t) crashes GCC)

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 6acc6af676d1..f225378f42c8 100644
--- 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 b88b11fc4302..e227137bfb09 100644
--- 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 a47925bec9d1..67312597c349 100644
--- 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
index 000000000000..0e836cfe6c8e
--- /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" } */
+}
+
+