commit 914701ed49f31323176a784b49df05a0d177d1ad
author Daniel Dunbar <daniel@zuster.org> Tue Aug 05 16:28:08 2008 +0000
committer Daniel Dunbar <daniel@zuster.org> Tue Aug 05 16:28:08 2008 +0000
tree 50084d57103bbaaa4ba230ffe8e76039e3e224cd
parent 894bbab6314e85b5bdc5b03b97d8561fbe8545a7

Move AsmLabel into Declarator instead of just a parameter to
  ActOnDeclarator.


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

lib/Parse/MinimalAction.cpp

diff --git a/lib/Parse/MinimalAction.cpp b/lib/Parse/MinimalAction.cpp
index 3529255..cb130c3 100644
--- a/lib/Parse/MinimalAction.cpp
+++ b/lib/Parse/MinimalAction.cpp
@@ -63,8 +63,7 @@
 /// IdentifierInfo::FETokenInfo field to keep track of this fact, until S is
 /// popped.
 Action::DeclTy *
-MinimalAction::ActOnDeclarator(Scope *S, Declarator &D, DeclTy *LastInGroup,
-                               ExprTy *AsmLabel) {
+MinimalAction::ActOnDeclarator(Scope *S, Declarator &D, DeclTy *LastInGroup) {
   IdentifierInfo *II = D.getIdentifier();
   
   // If there is no identifier associated with this declarator, bail out.

lib/Parse/ParseDecl.cpp

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 33482c5..1cf3317 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -256,13 +256,14 @@
   // rest of the init-declarator-list.
   while (1) {
     // If a simple-asm-expr is present, parse it.
-    ExprResult AsmLabel;
     if (Tok.is(tok::kw_asm)) {
-      AsmLabel = ParseSimpleAsm();
+      ExprResult AsmLabel = ParseSimpleAsm();
       if (AsmLabel.isInvalid) {
         SkipUntil(tok::semi);
         return 0;
       }
+      
+      D.setAsmLabel(AsmLabel.Val);
     }
     
     // If attributes are present, parse them.
@@ -271,8 +272,7 @@
 
     // Inform the current actions module that we just parsed this declarator.
     // FIXME: pass asm & attributes.
-    LastDeclInGroup = Actions.ActOnDeclarator(CurScope, D, LastDeclInGroup,
-                                              AsmLabel.Val);
+    LastDeclInGroup = Actions.ActOnDeclarator(CurScope, D, LastDeclInGroup);
         
     // Parse declarator '=' initializer.
     if (Tok.is(tok::equal)) {

lib/Parse/ParseObjc.cpp

diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index b18c7eb..0079701 100644
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -1222,7 +1222,7 @@
           ParseDeclarator(DeclaratorInfo);
           if (DeclaratorInfo.getIdentifier()) {
             DeclTy *aBlockVarDecl = Actions.ActOnDeclarator(CurScope, 
-                                                            DeclaratorInfo, 0, 0);
+                                                          DeclaratorInfo, 0);
             StmtResult stmtResult =
               Actions.ActOnDeclStmt(aBlockVarDecl, 
                                     DS.getSourceRange().getBegin(),