From: Mark Mitchell <mark@markmitchell.com>
Date: Thu, 10 Dec 1998 13:35:36 +0000 (+0000)
Subject: class.c (instantiate_type): Return error_mark_node rather than junk.
X-Git-Tag: prereleases/libgcj-0.1~1689
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=513e9d13b4619d6ee88fce6f59d24962951e6f71;p=thirdparty%2Fgcc.git

class.c (instantiate_type): Return error_mark_node rather than junk.

	* class.c (instantiate_type): Return error_mark_node rather than
	junk.

From-SVN: r24240
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cf09c640bcac..5348e3be2005 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-10  Mark Mitchell  <mark@markmitchell.com>
+
+	* class.c (instantiate_type): Return error_mark_node rather than
+	junk. 
+
 1998-12-09  Mark Mitchell  <mark@markmitchell.com>
 
 	* cp-tree.h (most_specialized_instantiation): New function.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 806ba6213216..46d162e50870 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5304,6 +5304,7 @@ instantiate_type (lhstype, rhs, complain)
 			  function);
 		cp_error ("  to form a pointer to member function, say `&%T::%D'",
 			  t, DECL_NAME (function));
+		return error_mark_node;
 	      }
 
 	    mark_used (function);
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb131.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb131.C
index f0f7febbd8c4..d966fd9c01fe 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb131.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb131.C
@@ -10,7 +10,7 @@ struct a {
 	void bar( double );
 	void bar( float );
 
-	void foo( void (a::*member)(float) );
+  void foo( void (a::*member)(float) ); // ERROR - candidate
 };
 
 a::a()