aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaAccess.cpp
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2010-03-26 04:53:08 +0000
committerJohn McCall <rjmccall@apple.com>2010-03-26 04:53:08 +0000
commitd325daa506338ab86f9dd468b48fd010673f49a6 (patch)
tree8506c020a0ca60f4812c19abb33735451b534780 /lib/Sema/SemaAccess.cpp
parent0703690603bd197b581ceb2fb9a020aa88b9a106 (diff)
Reapply r99596 with a fix: link an instantiated friend function to its
pattern if it has a body. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@99610 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaAccess.cpp')
-rw-r--r--lib/Sema/SemaAccess.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp
index a92989696e..4cfd99d5c5 100644
--- a/lib/Sema/SemaAccess.cpp
+++ b/lib/Sema/SemaAccess.cpp
@@ -319,7 +319,7 @@ static Sema::AccessResult MatchesFriend(Sema &S,
if (Friend == FTD->getCanonicalDecl())
return Sema::AR_accessible;
- if (MightInstantiateTo(S, FTD, Friend))
+ if (EC.isDependent() && MightInstantiateTo(S, FTD, Friend))
return Sema::AR_dependent;
return Sema::AR_inaccessible;