re PR c++/34870 (argument-dependent lookup fails to find friend declaration)

	PR c++/34870
	* name-lookup.c (arg_assoc_class): Call complete_type.
	* pt.c (instantiate_class_template): Call uses_template_parms
	instead of dependent_type_p.

From-SVN: r153958

gcc/cp/ChangeLog

 2009-11-05  Jason Merrill  <jason@redhat.com>
 
+	PR c++/34870
+	* name-lookup.c (arg_assoc_class): Call complete_type.
+	* pt.c (instantiate_class_template): Call uses_template_parms
+	instead of dependent_type_p.
+
 	PR c++/41703
 	* pt.c (check_undeduced_parms): New subroutine of...
 	(more_specialized_fn): ...here.  Undeduced template parms can make

gcc/cp/name-lookup.c

@@ -4780,6 +4780,8 @@ arg_assoc_class (struct arg_lookup *k, tree type)
   if (arg_assoc_namespace (k, context))
     return true;
 
+  complete_type (type);
+
   if (TYPE_BINFO (type))
     {
       /* Process baseclasses.  */

gcc/cp/pt.c

@@ -7358,7 +7358,7 @@ instantiate_class_template (tree type)
 
   if (TYPE_BEING_DEFINED (type)
       || COMPLETE_TYPE_P (type)
-      || dependent_type_p (type))
+      || uses_template_parms (type))
     return type;
 
   /* Figure out which template is being instantiated.  */

gcc/testsuite/ChangeLog

 2009-11-05  Jason Merrill  <jason@redhat.com>
 
+	PR c++/34870
+	* g++.dg/lookup/koenig7.C: New.
+
 	PR c++/41703
 	* g++.dg/template/partial6.C: New.
 

gcc/testsuite/g++.dg/lookup/koenig7.C

+// PR c++/34870
+
+template <typename T>
+struct Foo
+{
+  friend void func(const Foo &) {}
+};
+
+void check(const Foo<int> & x)
+{
+  func(x);
+}