commit d4f551b3491777ffcc7f2664327810219b7e0e16
author Anders Carlsson <andersca@mac.com> Mon May 11 22:42:30 2009 +0000
committer Anders Carlsson <andersca@mac.com> Mon May 11 22:42:30 2009 +0000
tree ddd13bd8baf9c6bb0946785880039e9c3a19baad
parent 159c763373b2fc26978dea9563eab3f097df9b3f

Fix test case by always setting the type spec type, even for friend decls.

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

lib/Parse/ParseDeclCXX.cpp

diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index da99ab9..0718d3b 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -530,14 +530,13 @@
     return;
   }
   
-  if (DS.isFriendSpecified() && 
-      !Actions.ActOnFriendDecl(CurScope, DS.getFriendSpecLoc(), 
-                               TagOrTempResult.get()))
-    return;
-    
   if (DS.SetTypeSpecType(TagType, StartLoc, PrevSpec, 
                          TagOrTempResult.get().getAs<void>()))
     Diag(StartLoc, diag::err_invalid_decl_spec_combination) << PrevSpec;
+  
+  if (DS.isFriendSpecified())
+    Actions.ActOnFriendDecl(CurScope, DS.getFriendSpecLoc(), 
+                            TagOrTempResult.get());
 }
 
 /// ParseBaseClause - Parse the base-clause of a C++ class [C++ class.derived].