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 cf09c640bcaca20251ae8d6d7364f09b2c5029e4..5348e3be2005e8628d21053e55db6159a68166d9 100644 (file)
--- 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 806ba6213216b8e90e0a4c7483637837eb72620e..46d162e50870a6ba0c1c4b9aa58547079d6a596f 100644 (file)
--- 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 f0f7febbd8c4c1f4836cc97fa36338d7a1080712..d966fd9c01fed62dfefe77c56ebe66f5a44b2759 100644 (file)
--- 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()