/cp

2010-08-30  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/45043
	* decl.c (grokdeclarator): Use MAIN_NAME_P only on IDENTIFIER_NODEs.

/testsuite
2010-08-30  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/45043
	* g++.dg/template/crash102.C: New.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index de8575c..071f8d6 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-30  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/45043
+       * decl.c (grokdeclarator): Use MAIN_NAME_P only on IDENTIFIER_NODEs.
+
 2010-08-30  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/45423

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 6465658..75fd9f7 100644 (file)
--- 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 62d329b..9bbb54b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-30  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/45043
+       * g++.dg/template/crash102.C: New.
+
 2010-08-30  Jakub Jelinek  <jakub@redhat.com>
 
        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 (file)
index 0000000..fd3c36e
--- /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" }
+{}