From: Mark Mitchell <mark@codesourcery.com>
Date: Fri, 2 Jul 2004 21:59:42 +0000 (+0000)
Subject: re PR c++/16270 (ICE on inner member template)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=717733d4539b2cac3a6a41c4a63eda56864c7364;p=gcc.git

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 7ebda95670e..dc5fa2849c3 100644
--- 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 ee7d76f3802..e591a257846 100644
--- 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: