From 9abfe98649d444d324f707d25071bcd8f31282e8 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Wed, 30 Nov 2011 19:55:36 +0000 Subject: [PATCH] re PR c/51321 (__builtin_types_compatible_p (any_type_t[1][], any_other_type_t) crashes GCC) 2011-11-30 Andrew Pinski PR c/51321 * c-parser.c (c_parser_postfix_expression): Check groktypename results before looking at the main variant. 2011-11-30 Andrew Pinski * gcc.dg/pr51321.c: New testcase. From-SVN: r181857 --- gcc/ChangeLog | 6 ++++++ gcc/c-parser.c | 11 +++++++++-- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/pr51321.c | 7 +++++++ 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr51321.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6acc6af..f225378 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-11-30 Andrew Pinski + + PR c/51321 + * c-parser.c (c_parser_postfix_expression): Check groktypename results + before looking at the main variant. + 2011-11-30 Jakub Jelinek PR rtl-optimization/48721 diff --git a/gcc/c-parser.c b/gcc/c-parser.c index b88b11f..e227137 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 a47925b..6731259 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-11-30 Andrew Pinski + + * gcc.dg/pr51321.c: New testcase. + 2011-11-30 Jakub Jelinek 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 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" } */ +} + + -- 2.7.4