move attribute reading to PCHReaderDecl.cpp, remove some

extraneous braces.

llvm-svn: 70191

Author: lattner

clang/lib/Frontend/PCHReader.cpp

@@ -1711,140 +1711,6 @@ std::string PCHReader::ReadString(const RecordData &Record, unsigned &Idx) {
   return Result;
 }
 
-/// \brief Reads attributes from the current stream position.
-Attr *PCHReader::ReadAttributes() {
-  unsigned Code = DeclsCursor.ReadCode();
-  assert(Code == llvm::bitc::UNABBREV_RECORD && 
-         "Expected unabbreviated record"); (void)Code;
-  
-  RecordData Record;
-  unsigned Idx = 0;
-  unsigned RecCode = DeclsCursor.ReadRecord(Code, Record);
-  assert(RecCode == pch::DECL_ATTR && "Expected attribute record"); 
-  (void)RecCode;
-
-#define SIMPLE_ATTR(Name)                       \
- case Attr::Name:                               \
-   New = ::new (Context) Name##Attr();          \
-   break
-
-#define STRING_ATTR(Name)                                       \
- case Attr::Name:                                               \
-   New = ::new (Context) Name##Attr(ReadString(Record, Idx));   \
-   break
-
-#define UNSIGNED_ATTR(Name)                             \
- case Attr::Name:                                       \
-   New = ::new (Context) Name##Attr(Record[Idx++]);     \
-   break
-
-  Attr *Attrs = 0;
-  while (Idx < Record.size()) {
-    Attr *New = 0;
-    Attr::Kind Kind = (Attr::Kind)Record[Idx++];
-    bool IsInherited = Record[Idx++];
-
-    switch (Kind) {
-    STRING_ATTR(Alias);
-    UNSIGNED_ATTR(Aligned);
-    SIMPLE_ATTR(AlwaysInline);
-    SIMPLE_ATTR(AnalyzerNoReturn);
-    STRING_ATTR(Annotate);
-    STRING_ATTR(AsmLabel);
-    
-    case Attr::Blocks:
-      New = ::new (Context) BlocksAttr(
-                                  (BlocksAttr::BlocksAttrTypes)Record[Idx++]);
-      break;
-      
-    case Attr::Cleanup:
-      New = ::new (Context) CleanupAttr(
-                                  cast<FunctionDecl>(GetDecl(Record[Idx++])));
-      break;
-
-    SIMPLE_ATTR(Const);
-    UNSIGNED_ATTR(Constructor);
-    SIMPLE_ATTR(DLLExport);
-    SIMPLE_ATTR(DLLImport);
-    SIMPLE_ATTR(Deprecated);
-    UNSIGNED_ATTR(Destructor);
-    SIMPLE_ATTR(FastCall);
-    
-    case Attr::Format: {
-      std::string Type = ReadString(Record, Idx);
-      unsigned FormatIdx = Record[Idx++];
-      unsigned FirstArg = Record[Idx++];
-      New = ::new (Context) FormatAttr(Type, FormatIdx, FirstArg);
-      break;
-    }
-
-    SIMPLE_ATTR(GNUInline);
-    
-    case Attr::IBOutletKind:
-      New = ::new (Context) IBOutletAttr();
-      break;
-
-    SIMPLE_ATTR(NoReturn);
-    SIMPLE_ATTR(NoThrow);
-    SIMPLE_ATTR(Nodebug);
-    SIMPLE_ATTR(Noinline);
-    
-    case Attr::NonNull: {
-      unsigned Size = Record[Idx++];
-      llvm::SmallVector<unsigned, 16> ArgNums;
-      ArgNums.insert(ArgNums.end(), &Record[Idx], &Record[Idx] + Size);
-      Idx += Size;
-      New = ::new (Context) NonNullAttr(&ArgNums[0], Size);
-      break;
-    }
-
-    SIMPLE_ATTR(ObjCException);
-    SIMPLE_ATTR(ObjCNSObject);
-    SIMPLE_ATTR(ObjCOwnershipRetain);
-    SIMPLE_ATTR(ObjCOwnershipReturns);
-    SIMPLE_ATTR(Overloadable);
-    UNSIGNED_ATTR(Packed);
-    SIMPLE_ATTR(Pure);
-    UNSIGNED_ATTR(Regparm);
-    STRING_ATTR(Section);
-    SIMPLE_ATTR(StdCall);
-    SIMPLE_ATTR(TransparentUnion);
-    SIMPLE_ATTR(Unavailable);
-    SIMPLE_ATTR(Unused);
-    SIMPLE_ATTR(Used);
-    
-    case Attr::Visibility:
-      New = ::new (Context) VisibilityAttr(
-                              (VisibilityAttr::VisibilityTypes)Record[Idx++]);
-      break;
-
-    SIMPLE_ATTR(WarnUnusedResult);
-    SIMPLE_ATTR(Weak);
-    SIMPLE_ATTR(WeakImport);
-    }
-
-    assert(New && "Unable to decode attribute?");
-    New->setInherited(IsInherited);
-    New->setNext(Attrs);
-    Attrs = New;
-  }
-#undef UNSIGNED_ATTR
-#undef STRING_ATTR
-#undef SIMPLE_ATTR
-
-  // The list of attributes was built backwards. Reverse the list
-  // before returning it.
-  Attr *PrevAttr = 0, *NextAttr = 0;
-  while (Attrs) {
-    NextAttr = Attrs->getNext();
-    Attrs->setNext(PrevAttr);
-    PrevAttr = Attrs;
-    Attrs = NextAttr;
-  }
-
-  return PrevAttr;
-}
-
 DiagnosticBuilder PCHReader::Diag(unsigned DiagID) {
   return Diag(SourceLocation(), DiagID);
 }