From b960ce040d53b610b2b2e3fb9c2220353a297229 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 30 Aug 2010 18:13:32 +0000 Subject: [PATCH] re PR c++/45043 (ICE: tree check: expected identifier_node, have bit_not_expr in grokdeclarator, at cp/decl.c:8113 on invalid code) /cp 2010-08-30 Paolo Carlini PR c++/45043 * decl.c (grokdeclarator): Use MAIN_NAME_P only on IDENTIFIER_NODEs. /testsuite 2010-08-30 Paolo Carlini PR c++/45043 * g++.dg/template/crash102.C: New. From-SVN: r163655 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/template/crash102.C | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/template/crash102.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index de8575c0717..071f8d6deb8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-08-30 Paolo Carlini + + PR c++/45043 + * decl.c (grokdeclarator): Use MAIN_NAME_P only on IDENTIFIER_NODEs. + 2010-08-30 Jakub Jelinek PR middle-end/45423 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 6465658f5de..75fd9f759b9 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8115,7 +8115,8 @@ grokdeclarator (const cp_declarator *declarator, common. With no options, it is allowed. With -Wreturn-type, it is a warning. It is only an error with -pedantic-errors. */ is_main = (funcdef_flag - && dname && MAIN_NAME_P (dname) + && dname && TREE_CODE (dname) == IDENTIFIER_NODE + && MAIN_NAME_P (dname) && ctype == NULL_TREE && in_namespace == NULL_TREE && current_namespace == global_namespace); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 62d329b6a06..9bbb54bbf38 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-08-30 Paolo Carlini + + PR c++/45043 + * g++.dg/template/crash102.C: New. + 2010-08-30 Jakub Jelinek PR middle-end/45423 diff --git a/gcc/testsuite/g++.dg/template/crash102.C b/gcc/testsuite/g++.dg/template/crash102.C new file mode 100644 index 00000000000..fd3c36eec87 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash102.C @@ -0,0 +1,5 @@ +// PR c++/45043 + +template < typename > class A; +template < typename T > A < T >::B::~B () // { dg-error "type" } +{}