commit 69f0193ae38db8d347b69ef27e51b4c268f91309
author Chris Lattner <sabre@nondot.org> Thu Feb 21 01:32:26 2008 +0000
committer Chris Lattner <sabre@nondot.org> Thu Feb 21 01:32:26 2008 +0000
tree 3bdb1f5d57c1a37fce2f5f15c7701fe02f500a9f
parent 1aaeeb91a305504e28bfa619425d4fab633c7bff

Collect and build and process type attributes on pointers.  For 
example, we can now correctly build the type for things like:
    _AS1 float * _AS2 *B;



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

Parse/ParseDecl.cpp

diff --git a/Parse/ParseDecl.cpp b/Parse/ParseDecl.cpp
index 3b6e04d..d8aba9d 100644
--- a/Parse/ParseDecl.cpp
+++ b/Parse/ParseDecl.cpp
@@ -1064,14 +1064,14 @@
   tok::TokenKind Kind = Tok.getKind();
 
   // Not a pointer or C++ reference.
-  if (Kind != tok::star && !(Kind == tok::amp && getLang().CPlusPlus))
+  if (Kind != tok::star && (Kind != tok::amp || !getLang().CPlusPlus))
     return ParseDirectDeclarator(D);
   
   // Otherwise, '*' -> pointer or '&' -> reference.
   SourceLocation Loc = ConsumeToken();  // Eat the * or &.
 
   if (Kind == tok::star) {
-    // Is a pointer
+    // Is a pointer.
     DeclSpec DS;
     
     ParseTypeQualifierListOpt(DS);
@@ -1080,7 +1080,8 @@
     ParseDeclaratorInternal(D);
 
     // Remember that we parsed a pointer type, and remember the type-quals.
-    D.AddTypeInfo(DeclaratorChunk::getPointer(DS.getTypeQualifiers(), Loc));
+    D.AddTypeInfo(DeclaratorChunk::getPointer(DS.getTypeQualifiers(), Loc,
+                                              DS.TakeAttributes()));
   } else {
     // Is a reference
     DeclSpec DS;
@@ -1108,7 +1109,8 @@
     ParseDeclaratorInternal(D);
 
     // Remember that we parsed a reference type. It doesn't have type-quals.
-    D.AddTypeInfo(DeclaratorChunk::getReference(DS.getTypeQualifiers(), Loc));
+    D.AddTypeInfo(DeclaratorChunk::getReference(DS.getTypeQualifiers(), Loc,
+                                                DS.TakeAttributes()));
   }
 }
 
@@ -1385,11 +1387,8 @@
         
       ParamInfo.push_back(DeclaratorChunk::ParamInfo(ParmII, 
         ParmDecl.getIdentifierLoc(), ParamTy.Val, ParmDecl.getInvalidType(),
-        ParmDecl.getDeclSpec().getAttributes()));
+        ParmDecl.getDeclSpec().TakeAttributes()));
 
-      // Ownership of DeclSpec has been handed off to ParamInfo.
-      DS.clearAttributes();
-      
       // If the next token is a comma, consume it and keep reading arguments.
       if (Tok.isNot(tok::comma)) break;