summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclCXX.cpp
diff options
context:
space:
mode:
authorNikola Smiljanic <popizdeh@gmail.com>2014-07-17 01:59:34 +0000
committerNikola Smiljanic <popizdeh@gmail.com>2014-07-17 01:59:34 +0000
commit4fc91538e93860a0b86b72530054acc301ab9c0e (patch)
tree63bfaf383e493bac3327464097d2045de093544e /clang/lib/Sema/SemaDeclCXX.cpp
parent354e23b029e6337eefacb28bcda0cf3bae85b635 (diff)
downloadbcm5719-llvm-4fc91538e93860a0b86b72530054acc301ab9c0e.tar.gz
bcm5719-llvm-4fc91538e93860a0b86b72530054acc301ab9c0e.zip
Fix FriendDecl source location and range for class templates and function declarations that don't start with 'friend' keyword. Add more unittests.
llvm-svn: 213220
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 99eedf34872..281241ba753 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -11626,11 +11626,10 @@ Decl *Sema::ActOnTemplatedFriendTag(Scope *S, SourceLocation FriendLoc,
if (Invalid)
return nullptr;
- return CheckClassTemplate(S, TagSpec, TUK_Friend, TagLoc,
- SS, Name, NameLoc, Attr,
- TemplateParams, AS_public,
+ return CheckClassTemplate(S, TagSpec, TUK_Friend, TagLoc, SS, Name,
+ NameLoc, Attr, TemplateParams, AS_public,
/*ModulePrivateLoc=*/SourceLocation(),
- TempParamLists.size() - 1,
+ FriendLoc, TempParamLists.size() - 1,
TempParamLists.data()).get();
} else {
// The "template<>" header is extraneous.
OpenPOWER on IntegriCloud