[cfe-commits] r99407 - in /cfe/trunk: lib/Sema/SemaDecl.cpp test/CXX/temp/temp.decls/temp.friend/p1.cpp

[Douglas Gregor]

Author: dgregor
Date: Wed Mar 24 12:31:23 2010
New Revision: 99407

URL: http://llvm.org/viewvc/llvm-project?rev=99407&view=rev
Log:
Silently drop dependent friend function template specializations,
since we have absolutely no way to match them when they are declared
nor do we have a way to represent these parsed-but-not-checked friend
declarations.

Modified:
    cfe/trunk/lib/Sema/SemaDecl.cpp
    cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p1.cpp

Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=99407&r1=99406&r2=99407&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Wed Mar 24 12:31:23 2010
@@ -3130,10 +3130,17 @@
   }
 
   if (isFunctionTemplateSpecialization) {
-      if (CheckFunctionTemplateSpecialization(NewFD,
-                               (HasExplicitTemplateArgs ? &TemplateArgs : 0),
-                                              Previous))
-        NewFD->setInvalidDecl();
+    if (isFriend && NewFD->getType()->isDependentType()) {
+      // FIXME: When we see a friend of a function template
+      // specialization with a dependent type, we can't match it now;
+      // for now, we just drop it, until we have a reasonable way to
+      // represent the parsed-but-not-matched friend function template
+      // specialization in the AST.
+      return 0;
+    } else if (CheckFunctionTemplateSpecialization(NewFD,
+                                   (HasExplicitTemplateArgs ? &TemplateArgs : 0),
+                                                 Previous))
+      NewFD->setInvalidDecl();
   } else if (isExplicitSpecialization && isa<CXXMethodDecl>(NewFD) &&
              CheckMemberSpecialization(NewFD, Previous))
     NewFD->setInvalidDecl();

Modified: cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p1.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p1.cpp?rev=99407&r1=99406&r2=99407&view=diff
==============================================================================
--- cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p1.cpp (original)
+++ cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p1.cpp Wed Mar 24 12:31:23 2010
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 -faccess-control -verify -emit-llvm-only %s
-
 template <typename T> struct Num {
   T value_;
 
@@ -117,3 +116,14 @@
   template class User<int>; // expected-note {{requested here}}
 
 }
+
+namespace Dependent {
+  template<typename T, typename Traits> class X;
+  template<typename T, typename Traits> 
+  X<T, Traits> operator+(const X<T, Traits>&, const T*);
+
+  template<typename T, typename Traits> class X {
+    typedef typename Traits::value_type value_type;
+    friend X operator+<>(const X&, const value_type*);
+  };
+}