[cfe-commits] r71486 - /cfe/trunk/lib/Parse/ParseDeclCXX.cpp

[Anders Carlsson]

Author: andersca
Date: Mon May 11 17:42:30 2009
New Revision: 71486

URL: http://llvm.org/viewvc/llvm-project?rev=71486&view=rev
Log:
Fix test case by always setting the type spec type, even for friend decls.

Modified:
    cfe/trunk/lib/Parse/ParseDeclCXX.cpp

Modified: cfe/trunk/lib/Parse/ParseDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDeclCXX.cpp?rev=71486&r1=71485&r2=71486&view=diff

==============================================================================
--- cfe/trunk/lib/Parse/ParseDeclCXX.cpp (original)
+++ cfe/trunk/lib/Parse/ParseDeclCXX.cpp Mon May 11 17:42:30 2009
@@ -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].