Index: testsuite/g++.dg/cpp0x/vt-35331.C
===================================================================
*** testsuite/g++.dg/cpp0x/vt-35331.C	(revision 0)
--- testsuite/g++.dg/cpp0x/vt-35331.C	(revision 0)
***************
*** 0 ****
--- 1,7 ----
+ // { dg-options "-std=c++0x" }
+ template<typename...> struct A;
+ 
+ template<typename...T> struct A<T*> // { dg-error "not expanded|T" }
+ {                                   // { dg-error "not expanded|T" }
+   friend void foo();
+ };
Index: cp/friend.c
===================================================================
*** cp/friend.c	(revision 134240)
--- cp/friend.c	(working copy)
*************** add_friend (tree type, tree decl, bool c
*** 143,148 ****
--- 143,151 ----
    name = DECL_NAME (decl);
    type = TREE_TYPE (typedecl);
  
+   if (type == error_mark_node)
+     return;
+ 
    while (list)
      {
        if (name == FRIEND_NAME (list))