From: Steven Bosscher <stevenb@suse.de>
Date: Tue, 13 Jan 2004 00:44:51 +0000 (+0000)
Subject: re PR c++/13558 (ICE (illegal code) at cp/friend.c:200)
X-Git-Tag: releases/gcc-3.4.0~1053
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fdd09134be318d63400363c8626141dcdba9686a;p=thirdparty%2Fgcc.git

re PR c++/13558 (ICE (illegal code) at cp/friend.c:200)

	PR c++/13558
	* parser.c (cp_parser_member_declaration): Any non-type is also
	not a class or a function.

From-SVN: r75776
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7dd1d8862a75..859f9799a922 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-12  Steven Bosscher  <stevenb@suse.de>
+
+	PR c++/13558
+	* parser.c (cp_parser_member_declaration): Any non-type is also
+	not a class or a function.
+
 2004-01-12  Jason Merrill  <jason@redhat.com>
 
 	PR c++/12815
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index fe3a3dec9651..3de7c1d86d35 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -12226,7 +12226,7 @@ cp_parser_member_declaration (cp_parser* parser)
 			 }
 		     }
 		 }
-	       if (!type)
+	       if (!type || !TYPE_P (type))
 		 error ("friend declaration does not name a class or "
 			"function");
 	       else