From: Eric Christopher <echristo@apple.com>
Date: Thu, 21 Jul 2011 05:34:24 +0000 (+0000)
Subject: Speculatively revert 135649 to bring back the g++ testing bots.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4110e1399bf940317cee58d6a48a92f7b7a4ce54;p=clang

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 0328045145..9ad9a2f0f0 100644
--- 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)