commit 6d96d3ad1d95a58d81cc8b573d9bce444bbf8021
author Richard Smith <richard-llvm@metafoo.co.uk> Thu Mar 15 01:02:11 2012 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Thu Mar 15 01:02:11 2012 +0000
tree f6c0bd1148e37ce2f907e1d2ef2fb8dd12d0f2bb
parent 9ca33fd56720112bcc4bccb8aa6107abbb68cae3

Small cleanup: move trailing-return-type special-casing into
getDeclSpecContextFromDeclaratorContext.


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

lib/Parse/ParseDecl.cpp

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 3ff9da0..2fac0dc 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -36,9 +36,7 @@
                                  Declarator::TheContext Context,
                                  AccessSpecifier AS,
                                  Decl **OwnedType) {
-  DeclSpecContext DSC = DSC_normal;
-  if (Context == Declarator::TrailingReturnContext)
-    DSC = DSC_trailing;
+  DeclSpecContext DSC = getDeclSpecContextFromDeclaratorContext(Context);
 
   // Parse the common declaration-specifiers piece.
   DeclSpec DS(AttrFactory);
@@ -1629,6 +1627,8 @@
     return DSC_class;
   if (Context == Declarator::FileContext)
     return DSC_top_level;
+  if (Context == Declarator::TrailingReturnContext)
+    return DSC_trailing;
   return DSC_normal;
 }