re PR c++/31132 (ICE on inconsistent friend declaration)

/cp
2007-08-16  Paolo Carlini  <pcarlini@suse.de>

	PR c++/31132
	* pt.c (tsubst_friend_function): When check_classfn
	returns error_mark_node likewise return it.

/testsuite
2007-08-16  Paolo Carlini  <pcarlini@suse.de>

	PR c++/31132
	* g++.dg/template/crash69.C: New.

From-SVN: r127535

gcc/cp/ChangeLog

+2007-08-16  Paolo Carlini  <pcarlini@suse.de>
+
+	PR c++/31132
+	* pt.c (tsubst_friend_function): When check_classfn
+	returns error_mark_node likewise return it.
+
 2007-08-15  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/32992

gcc/cp/pt.c

@@ -6289,7 +6289,7 @@ tsubst_friend_function (tree decl, tree args)
 	  tree fn = check_classfn (context,
 				   new_friend, NULL_TREE);
 
-	  if (fn && fn != error_mark_node)
+	  if (fn)
 	    new_friend = fn;
 	}
     }

gcc/testsuite/ChangeLog

+2007-08-16  Paolo Carlini  <pcarlini@suse.de>
+
+	PR c++/31132
+	* g++.dg/template/crash69.C: New.
+
 2007-08-15  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* lib/target-supports.exp (check_effective_target_arm32): Use

gcc/testsuite/g++.dg/template/crash69.C

+// PR c++/31132
+
+template<typename T> class A
+{
+  static int i; // { dg-error "is private" }
+  friend int T::foo(); // { dg-error "does not match" }
+};
+
+struct B
+{
+  void foo() { A<B>::i; } // { dg-error "within|candidate" }
+};