Improved representation and support for friend class templates. Angst about same.

llvm-svn: 82088

1 files changed, 5 insertions, 6 deletions

diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp
index e1228cf1fdf..671a5421cc1 100644
--- a/clang/lib/Parse/ParseDeclCXX.cpp
+++ b/clang/lib/Parse/ParseDeclCXX.cpp
@@ -1011,12 +1011,15 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS,
   DeclSpec DS;
   ParseDeclarationSpecifiers(DS, TemplateInfo, AS, DSC_class);
 
+  Action::MultiTemplateParamsArg TemplateParams(Actions,
+      TemplateInfo.TemplateParams? TemplateInfo.TemplateParams->data() : 0,
+      TemplateInfo.TemplateParams? TemplateInfo.TemplateParams->size() : 0);
+
   if (Tok.is(tok::semi)) {
     ConsumeToken();
 
     if (DS.isFriendSpecified()) {
-      bool IsTemplate = TemplateInfo.Kind != ParsedTemplateInfo::NonTemplate;
-      Actions.ActOnFriendTypeDecl(CurScope, DS, IsTemplate);
+      Actions.ActOnFriendTypeDecl(CurScope, DS, move(TemplateParams));
     } else
       Actions.ParsedFreeStandingDeclSpec(CurScope, DS);
 
@@ -1119,10 +1122,6 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS,
     // this call will *not* return the created decl; It will return null.
     // See Sema::ActOnCXXMemberDeclarator for details.
 
-    Action::MultiTemplateParamsArg TemplateParams(Actions,
-        TemplateInfo.TemplateParams? TemplateInfo.TemplateParams->data() : 0,
-        TemplateInfo.TemplateParams? TemplateInfo.TemplateParams->size() : 0);
-
     DeclPtrTy ThisDecl;
     if (DS.isFriendSpecified()) {
       // TODO: handle initializers, bitfields, 'delete'