re PR c++/16270 (ICE on inner member template)

	PR c++/16270
	* decl.c (grokdeclarator): Robustify.

From-SVN: r84029

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7ebda95670ed593ea8a3be71f339483476fc64bc..dc5fa2849c374ded157a806ea88abfa8feec6ff9 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-02  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/16270
+       * decl.c (grokdeclarator): Robustify.
+
 2004-07-01  Richard Henderson  <rth@redhat.com>
 
        * class.c (fixed_type_or_null): Don't handle RTL_EXPR.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index ee7d76f380285475a39a03b44cc9e87e2d3083b8..e591a257846b957d8bec31ee1c82b3acd196d09e 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6379,6 +6379,8 @@ grokdeclarator (const cp_declarator *declarator,
              }
            if (TREE_CODE (decl) == BASELINK)
              decl = BASELINK_FUNCTIONS (decl);
+           if (decl == error_mark_node)
+             return error_mark_node;
            switch (TREE_CODE (decl))
              {
              case BIT_NOT_EXPR: