[cfe-commits] r111611 - in /cfe/trunk: lib/Sema/SemaAccess.cpp lib/Sema/SemaDeclCXX.cpp lib/Sema/SemaTemplate.cpp test/CXX/temp/temp.decls/temp.friend/p5.cpp
Douglas Gregor
dgregor at apple.com
Thu Aug 19 20:26:10 PDT 2010
Author: dgregor
Date: Thu Aug 19 22:26:10 2010
New Revision: 111611
URL: http://llvm.org/viewvc/llvm-project?rev=111611&view=rev
Log:
Revert r111609, which is failing its new test.
Modified:
cfe/trunk/lib/Sema/SemaAccess.cpp
cfe/trunk/lib/Sema/SemaDeclCXX.cpp
cfe/trunk/lib/Sema/SemaTemplate.cpp
cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p5.cpp
Modified: cfe/trunk/lib/Sema/SemaAccess.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaAccess.cpp?rev=111611&r1=111610&r2=111611&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaAccess.cpp (original)
+++ cfe/trunk/lib/Sema/SemaAccess.cpp Thu Aug 19 22:26:10 2010
@@ -514,9 +514,6 @@
static AccessResult MatchesFriend(Sema &S,
const EffectiveContext &EC,
FriendDecl *FriendD) {
- if (FriendD->isInvalidDecl())
- return AR_accessible;
-
if (TypeSourceInfo *T = FriendD->getFriendType())
return MatchesFriend(S, EC, T->getType()->getCanonicalTypeUnqualified());
Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=111611&r1=111610&r2=111611&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Thu Aug 19 22:26:10 2010
@@ -6538,8 +6538,6 @@
FrD->setAccess(AS_public);
CurContext->addDecl(FrD);
- if (ND->isInvalidDecl()) FrD->setInvalidDecl();
-
return DeclPtrTy::make(ND);
}
Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=111611&r1=111610&r2=111611&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplate.cpp Thu Aug 19 22:26:10 2010
@@ -1365,12 +1365,8 @@
// If there were at least as many template-ids as there were template
// parameter lists, then there are no template parameter lists remaining for
// the declaration itself.
- if (Idx >= NumParamLists) {
- // Silently drop template member friend declarations.
- // TODO: implement these
- if (IsFriend && NumParamLists) Invalid = true;
+ if (Idx >= NumParamLists)
return 0;
- }
// If there were too many template parameter lists, complain about that now.
if (Idx != NumParamLists - 1) {
@@ -1399,11 +1395,6 @@
}
}
- // Silently drop template member template friend declarations.
- // TODO: implement these
- if (IsFriend && NumParamLists > 1)
- Invalid = true;
-
// Return the last template parameter list, which corresponds to the
// entity being declared.
return ParamLists[NumParamLists - 1];
Modified: cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p5.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p5.cpp?rev=111611&r1=111610&r2=111611&view=diff
==============================================================================
--- cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p5.cpp (original)
+++ cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p5.cpp Thu Aug 19 22:26:10 2010
@@ -1,58 +1,13 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
-namespace test0 {
- template <class T> class A {
- class Member {};
+template <class T> class A {
+ class Member {
};
+};
- class B {
- template <class T> friend class A<T>::Member;
- };
-
- A<int> a;
- B b;
-}
-
-// rdar://problem/8204127
-namespace test1 {
- template <class T> struct A;
-
- class C {
- static void foo();
- template <class T> friend void A<T>::f();
- };
+class B {
+ template <class T> friend class A<T>::Member;
+};
- template <class T> struct A {
- void f() { C::foo(); }
- };
-
- template <class T> struct A<T*> {
- void f() { C::foo(); }
- };
-
- template <> struct A<char> {
- void f() { C::foo(); }
- };
-}
-
-// FIXME: these should fail!
-namespace test2 {
- template <class T> struct A;
-
- class C {
- static void foo();
- template <class T> friend void A<T>::g();
- };
-
- template <class T> struct A {
- void f() { C::foo(); }
- };
-
- template <class T> struct A<T*> {
- void f() { C::foo(); }
- };
-
- template <> struct A<char> {
- void f() { C::foo(); }
- };
-}
+A<int> a;
+B b;
More information about the cfe-commits
mailing list