diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a2d44dce186db9977e72f2b668b8321713e267e8..0dfc57f6048e0cf0db25b45b1e6d3cfc7704ed3e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 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
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index c3f742ea2e86a2306423f4a23ff89c2c14b97791..14f97873484b6583bdff149a52445a7b732aa321 100644
--- a/gcc/cp/name-lookup.c
+++ b/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.  */
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 74273eb5e780198117e25aefd6d2bde43e93680c..d4556cd527f6e73b58ae64fb1968eeab8c8c9d2a 100644
--- a/gcc/cp/pt.c
+++ b/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.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6454237a5945a2daafbf23287144d284d7b7c139..eedfe22933732f670b44fa3d0e43a36258dc4ab5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 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.
 
diff --git a/gcc/testsuite/g++.dg/lookup/koenig7.C b/gcc/testsuite/g++.dg/lookup/koenig7.C
new file mode 100644
index 0000000000000000000000000000000000000000..bc54ba96b6b95aa4823a9bd74256a547b153654b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/koenig7.C
@@ -0,0 +1,12 @@
+// PR c++/34870
+
+template <typename T>
+struct Foo
+{
+  friend void func(const Foo &) {}
+};
+
+void check(const Foo<int> & x)
+{
+  func(x);
+}