Speculatively revert 135649 to bring back the g++ testing bots.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135668 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 03280451452b76e3e9a88f8b902117d3b9a89c55..9ad9a2f0f0adf22fdcc0f86029970fe4025f2018 100644 (file)
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -8263,13 +8263,11 @@ Decl *Sema::ActOnTemplatedFriendTag(Scope *S, SourceLocation FriendLoc,
       if (Invalid)
         return 0;
 
-      Decl * Result = CheckClassTemplate(S, TagSpec, TUK_Friend, TagLoc,
-                                         SS, Name, NameLoc, Attr,
-                                         TemplateParams, AS_public,
-                                         TempParamLists.size() - 1,
+      return CheckClassTemplate(S, TagSpec, TUK_Friend, TagLoc,
+                                SS, Name, NameLoc, Attr,
+                                TemplateParams, AS_public,
+                                TempParamLists.size() - 1,
                    (TemplateParameterList**) TempParamLists.release()).take();
-      Result->setAccess(AS_public);
-      return Result;
     } else {
       // The "template<>" header is extraneous.
       Diag(TemplateParams->getTemplateLoc(), diag::err_template_tag_noparams)