14 files changed, 0 insertions, 4019 deletions

diff --git a/utils/TableGen/CMakeLists.txt b/utils/TableGen/CMakeLists.txt
index a845ed201d..02ebd67ba6 100644
--- a/utils/TableGen/CMakeLists.txt
+++ b/utils/TableGen/CMakeLists.txt
@@ -7,10 +7,6 @@ add_tablegen(llvm-tblgen LLVM
   AsmWriterEmitter.cpp
   AsmWriterInst.cpp
   CallingConvEmitter.cpp
-  ClangASTNodesEmitter.cpp
-  ClangAttrEmitter.cpp
-  ClangDiagnosticsEmitter.cpp
-  ClangSACheckersEmitter.cpp
   CodeEmitterGen.cpp
   CodeGenDAGPatterns.cpp
   CodeGenInstruction.cpp
@@ -28,8 +24,6 @@ add_tablegen(llvm-tblgen LLVM
   InstrEnumEmitter.cpp
   InstrInfoEmitter.cpp
   IntrinsicEmitter.cpp
-  NeonEmitter.cpp
-  OptParserEmitter.cpp
   PseudoLoweringEmitter.cpp
   RegisterInfoEmitter.cpp
   SetTheory.cpp
diff --git a/utils/TableGen/ClangASTNodesEmitter.cpp b/utils/TableGen/ClangASTNodesEmitter.cpp
deleted file mode 100644
index d9d5a3ccd9..0000000000
--- a/utils/TableGen/ClangASTNodesEmitter.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-//=== ClangASTNodesEmitter.cpp - Generate Clang AST node tables -*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// These tablegen backends emit Clang AST node tables
-//
-//===----------------------------------------------------------------------===//
-
-#include "ClangASTNodesEmitter.h"
-#include <set>
-using namespace llvm;
-
-//===----------------------------------------------------------------------===//
-// Statement Node Tables (.inc file) generation.
-//===----------------------------------------------------------------------===//
-
-// Returns the first and last non-abstract subrecords
-// Called recursively to ensure that nodes remain contiguous
-std::pair<Record *, Record *> ClangASTNodesEmitter::EmitNode(
-                                                           const ChildMap &Tree,
-                                                           raw_ostream &OS,
-                                                           Record *Base) {
-  std::string BaseName = macroName(Base->getName());
-
-  ChildIterator i = Tree.lower_bound(Base), e = Tree.upper_bound(Base);
-
-  Record *First = 0, *Last = 0;
-  // This might be the pseudo-node for Stmt; don't assume it has an Abstract
-  // bit
-  if (Base->getValue("Abstract") && !Base->getValueAsBit("Abstract"))
-    First = Last = Base;
-
-  for (; i != e; ++i) {
-    Record *R = i->second;
-    bool Abstract = R->getValueAsBit("Abstract");
-    std::string NodeName = macroName(R->getName());
-
-    OS << "#ifndef " << NodeName << "\n";
-    OS << "#  define " << NodeName << "(Type, Base) "
-        << BaseName << "(Type, Base)\n";
-    OS << "#endif\n";
-
-    if (Abstract)
-      OS << "ABSTRACT_" << macroName(Root.getName()) << "(" << NodeName << "("
-          << R->getName() << ", " << baseName(*Base) << "))\n";
-    else
-      OS << NodeName << "(" << R->getName() << ", "
-          << baseName(*Base) << ")\n";
-
-    if (Tree.find(R) != Tree.end()) {
-      const std::pair<Record *, Record *> &Result
-        = EmitNode(Tree, OS, R);
-      if (!First && Result.first)
-        First = Result.first;
-      if (Result.second)
-        Last = Result.second;
-    } else {
-      if (!Abstract) {
-        Last = R;
-
-        if (!First)
-          First = R;
-      }
-    }
-
-    OS << "#undef " << NodeName << "\n\n";
-  }
-
-  if (First) {
-    assert (Last && "Got a first node but not a last node for a range!");
-    if (Base == &Root)
-      OS << "LAST_" << macroName(Root.getName()) << "_RANGE(";
-    else
-      OS << macroName(Root.getName()) << "_RANGE(";
-    OS << Base->getName() << ", " << First->getName() << ", "
-       << Last->getName() << ")\n\n";
-  }
-
-  return std::make_pair(First, Last);
-}
-
-void ClangASTNodesEmitter::run(raw_ostream &OS) {
-  // Write the preamble
-  OS << "#ifndef ABSTRACT_" << macroName(Root.getName()) << "\n";
-  OS << "#  define ABSTRACT_" << macroName(Root.getName()) << "(Type) Type\n";
-  OS << "#endif\n";
-
-  OS << "#ifndef " << macroName(Root.getName()) << "_RANGE\n";
-  OS << "#  define "
-     << macroName(Root.getName()) << "_RANGE(Base, First, Last)\n";
-  OS << "#endif\n\n";
-
-  OS << "#ifndef LAST_" << macroName(Root.getName()) << "_RANGE\n";
-  OS << "#  define LAST_" 
-     << macroName(Root.getName()) << "_RANGE(Base, First, Last) " 
-     << macroName(Root.getName()) << "_RANGE(Base, First, Last)\n";
-  OS << "#endif\n\n";
- 
-  // Emit statements
-  const std::vector<Record*> Stmts
-    = Records.getAllDerivedDefinitions(Root.getName());
-
-  ChildMap Tree;
-
-  for (unsigned i = 0, e = Stmts.size(); i != e; ++i) {
-    Record *R = Stmts[i];
-
-    if (R->getValue("Base"))
-      Tree.insert(std::make_pair(R->getValueAsDef("Base"), R));
-    else
-      Tree.insert(std::make_pair(&Root, R));
-  }
-
-  EmitNode(Tree, OS, &Root);
-
-  OS << "#undef " << macroName(Root.getName()) << "\n";
-  OS << "#undef " << macroName(Root.getName()) << "_RANGE\n";
-  OS << "#undef LAST_" << macroName(Root.getName()) << "_RANGE\n";
-  OS << "#undef ABSTRACT_" << macroName(Root.getName()) << "\n";
-}
-
-void ClangDeclContextEmitter::run(raw_ostream &OS) {
-  // FIXME: Find a .td file format to allow for this to be represented better.
-
-  OS << "#ifndef DECL_CONTEXT\n";
-  OS << "#  define DECL_CONTEXT(DECL)\n";
-  OS << "#endif\n";
-  
-  OS << "#ifndef DECL_CONTEXT_BASE\n";
-  OS << "#  define DECL_CONTEXT_BASE(DECL) DECL_CONTEXT(DECL)\n";
-  OS << "#endif\n";
-  
-  typedef std::set<Record*> RecordSet;
-  typedef std::vector<Record*> RecordVector;
-  
-  RecordVector DeclContextsVector
-    = Records.getAllDerivedDefinitions("DeclContext");
-  RecordVector Decls = Records.getAllDerivedDefinitions("Decl");
-  RecordSet DeclContexts (DeclContextsVector.begin(), DeclContextsVector.end());
-   
-  for (RecordVector::iterator i = Decls.begin(), e = Decls.end(); i != e; ++i) {
-    Record *R = *i;
-
-    if (R->getValue("Base")) {
-      Record *B = R->getValueAsDef("Base");
-      if (DeclContexts.find(B) != DeclContexts.end()) {
-        OS << "DECL_CONTEXT_BASE(" << B->getName() << ")\n";
-        DeclContexts.erase(B);
-      }
-    }
-  }
-
-  // To keep identical order, RecordVector may be used
-  // instead of RecordSet.
-  for (RecordVector::iterator
-         i = DeclContextsVector.begin(), e = DeclContextsVector.end();
-       i != e; ++i)
-    if (DeclContexts.find(*i) != DeclContexts.end())
-      OS << "DECL_CONTEXT(" << (*i)->getName() << ")\n";
-
-  OS << "#undef DECL_CONTEXT\n";
-  OS << "#undef DECL_CONTEXT_BASE\n";
-}
diff --git a/utils/TableGen/ClangASTNodesEmitter.h b/utils/TableGen/ClangASTNodesEmitter.h
deleted file mode 100644
index edd9316544..0000000000
--- a/utils/TableGen/ClangASTNodesEmitter.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//===- ClangASTNodesEmitter.h - Generate Clang AST node tables -*- C++ -*--===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// These tablegen backends emit Clang AST node tables
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef CLANGAST_EMITTER_H
-#define CLANGAST_EMITTER_H
-
-#include "llvm/TableGen/TableGenBackend.h"
-#include "llvm/TableGen/Record.h"
-#include <string>
-#include <cctype>
-#include <map>
-
-namespace llvm {
-
-/// ClangASTNodesEmitter - The top-level class emits .inc files containing
-///  declarations of Clang statements.
-///
-class ClangASTNodesEmitter : public TableGenBackend {
-  // A map from a node to each of its derived nodes.
-  typedef std::multimap<Record*, Record*> ChildMap;
-  typedef ChildMap::const_iterator ChildIterator;
-
-  RecordKeeper &Records;
-  Record Root;
-  const std::string &BaseSuffix;
-
-  // Create a macro-ized version of a name
-  static std::string macroName(std::string S) {
-    for (unsigned i = 0; i < S.size(); ++i)
-      S[i] = std::toupper(S[i]);
-
-    return S;
-  }
-
-  // Return the name to be printed in the base field. Normally this is
-  // the record's name plus the base suffix, but if it is the root node and
-  // the suffix is non-empty, it's just the suffix.
-  std::string baseName(Record &R) {
-    if (&R == &Root && !BaseSuffix.empty())
-      return BaseSuffix;
-    
-    return R.getName() + BaseSuffix;
-  }
-
-  std::pair<Record *, Record *> EmitNode (const ChildMap &Tree, raw_ostream& OS,
-                                          Record *Base);
-public:
-  explicit ClangASTNodesEmitter(RecordKeeper &R, const std::string &N,
-                                const std::string &S)
-    : Records(R), Root(N, SMLoc(), R), BaseSuffix(S)
-    {}
-
-  // run - Output the .inc file contents
-  void run(raw_ostream &OS);
-};
-
-/// ClangDeclContextEmitter - Emits an addendum to a .inc file to enumerate the
-/// clang declaration contexts.
-///
-class ClangDeclContextEmitter : public TableGenBackend {
-  RecordKeeper &Records;
-
-public:
-  explicit ClangDeclContextEmitter(RecordKeeper &R)
-    : Records(R)
-  {}
-
-  // run - Output the .inc file contents
-  void run(raw_ostream &OS);
-};
-
-} // End llvm namespace
-
-#endif
diff --git a/utils/TableGen/ClangAttrEmitter.cpp b/utils/TableGen/ClangAttrEmitter.cpp
deleted file mode 100644
index 5f25b8fa56..0000000000
--- a/utils/TableGen/ClangAttrEmitter.cpp
+++ /dev/null
@@ -1,788 +0,0 @@
-//===- ClangAttrEmitter.cpp - Generate Clang attribute handling =-*- C++ -*--=//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// These tablegen backends emit Clang attribute processing code
-//
-//===----------------------------------------------------------------------===//
-
-#include "ClangAttrEmitter.h"
-#include "llvm/ADT/StringSwitch.h"
-#include "llvm/TableGen/Record.h"
-#include <algorithm>
-#include <cctype>
-
-using namespace llvm;
-
-static const std::vector<StringRef>
-getValueAsListOfStrings(Record &R, StringRef FieldName) {
-  ListInit *List = R.getValueAsListInit(FieldName);
-  assert (List && "Got a null ListInit");
-
-  std::vector<StringRef> Strings;
-  Strings.reserve(List->getSize());
-
-  for (ListInit::const_iterator i = List->begin(), e = List->end();
-       i != e;
-       ++i) {
-    assert(*i && "Got a null element in a ListInit");
-    if (StringInit *S = dynamic_cast<StringInit *>(*i))
-      Strings.push_back(S->getValue());
-    else if (CodeInit *C = dynamic_cast<CodeInit *>(*i))
-      Strings.push_back(C->getValue());
-    else
-      assert(false && "Got a non-string, non-code element in a ListInit");
-  }
-
-  return Strings;
-}
-
-static std::string ReadPCHRecord(StringRef type) {
-  return StringSwitch<std::string>(type)
-    .EndsWith("Decl *", "GetLocalDeclAs<" 
-              + std::string(type, 0, type.size()-1) + ">(F, Record[Idx++])")
-    .Case("QualType", "getLocalType(F, Record[Idx++])")
-    .Case("Expr *", "ReadSubExpr()")
-    .Case("IdentifierInfo *", "GetIdentifierInfo(F, Record, Idx)")
-    .Case("SourceLocation", "ReadSourceLocation(F, Record, Idx)")
-    .Default("Record[Idx++]");
-}
-
-// Assumes that the way to get the value is SA->getname()
-static std::string WritePCHRecord(StringRef type, StringRef name) {
-  return StringSwitch<std::string>(type)
-    .EndsWith("Decl *", "AddDeclRef(" + std::string(name) +
-                        ", Record);\n")
-    .Case("QualType", "AddTypeRef(" + std::string(name) + ", Record);\n")
-    .Case("Expr *", "AddStmt(" + std::string(name) + ");\n")
-    .Case("IdentifierInfo *", 
-          "AddIdentifierRef(" + std::string(name) + ", Record);\n")
-    .Case("SourceLocation", 
-          "AddSourceLocation(" + std::string(name) + ", Record);\n")
-    .Default("Record.push_back(" + std::string(name) + ");\n");
-}
-
-namespace {
-  class Argument {
-    std::string lowerName, upperName;
-    StringRef attrName;
-
-  public:
-    Argument(Record &Arg, StringRef Attr)
-      : lowerName(Arg.getValueAsString("Name")), upperName(lowerName),
-        attrName(Attr) {
-      if (!lowerName.empty()) {
-        lowerName[0] = std::tolower(lowerName[0]);
-        upperName[0] = std::toupper(upperName[0]);
-      }
-    }
-    virtual ~Argument() {}
-
-    StringRef getLowerName() const { return lowerName; }
-    StringRef getUpperName() const { return upperName; }
-    StringRef getAttrName() const { return attrName; }
-
-    // These functions print the argument contents formatted in different ways.
-    virtual void writeAccessors(raw_ostream &OS) const = 0;
-    virtual void writeAccessorDefinitions(raw_ostream &OS) const {}
-    virtual void writeCloneArgs(raw_ostream &OS) const = 0;
-    virtual void writeCtorBody(raw_ostream &OS) const {}
-    virtual void writeCtorInitializers(raw_ostream &OS) const = 0;
-    virtual void writeCtorParameters(raw_ostream &OS) const = 0;
-    virtual void writeDeclarations(raw_ostream &OS) const = 0;
-    virtual void writePCHReadArgs(raw_ostream &OS) const = 0;
-    virtual void writePCHReadDecls(raw_ostream &OS) const = 0;
-    virtual void writePCHWrite(raw_ostream &OS) const = 0;
-  };
-
-  class SimpleArgument : public Argument {
-    std::string type;
-
-  public:
-    SimpleArgument(Record &Arg, StringRef Attr, std::string T)
-      : Argument(Arg, Attr), type(T)
-    {}
-
-    void writeAccessors(raw_ostream &OS) const {
-      OS << "  " << type << " get" << getUpperName() << "() const {\n";
-      OS << "    return " << getLowerName() << ";\n";
-      OS << "  }";
-    }
-    void writeCloneArgs(raw_ostream &OS) const {
-      OS << getLowerName();
-    }
-    void writeCtorInitializers(raw_ostream &OS) const {
-      OS << getLowerName() << "(" << getUpperName() << ")";
-    }
-    void writeCtorParameters(raw_ostream &OS) const {
-      OS << type << " " << getUpperName();
-    }
-    void writeDeclarations(raw_ostream &OS) const {
-      OS << type << " " << getLowerName() << ";";
-    }
-    void writePCHReadDecls(raw_ostream &OS) const {
-      std::string read = ReadPCHRecord(type);
-      OS << "    " << type << " " << getLowerName() << " = " << read << ";\n";
-    }
-    void writePCHReadArgs(raw_ostream &OS) const {
-      OS << getLowerName();
-    }
-    void writePCHWrite(raw_ostream &OS) const {
-      OS << "    " << WritePCHRecord(type, "SA->get" +
-                                           std::string(getUpperName()) + "()");
-    }
-  };
-
-  class StringArgument : public Argument {
-  public:
-    StringArgument(Record &Arg, StringRef Attr)
-      : Argument(Arg, Attr)
-    {}
-
-    void writeAccessors(raw_ostream &OS) const {
-      OS << "  llvm::StringRef get" << getUpperName() << "() const {\n";
-      OS << "    return llvm::StringRef(" << getLowerName() << ", "
-         << getLowerName() << "Length);\n";
-      OS << "  }\n";
-      OS << "  unsigned get" << getUpperName() << "Length() const {\n";
-      OS << "    return " << getLowerName() << "Length;\n";
-      OS << "  }\n";
-      OS << "  void set" << getUpperName()
-         << "(ASTContext &C, llvm::StringRef S) {\n";
-      OS << "    " << getLowerName() << "Length = S.size();\n";
-      OS << "    this->" << getLowerName() << " = new (C, 1) char ["
-         << getLowerName() << "Length];\n";
-      OS << "    std::memcpy(this->" << getLowerName() << ", S.data(), "
-         << getLowerName() << "Length);\n";
-      OS << "  }";
-    }
-    void writeCloneArgs(raw_ostream &OS) const {
-      OS << "get" << getUpperName() << "()";
-    }
-    void writeCtorBody(raw_ostream &OS) const {
-      OS << "      std::memcpy(" << getLowerName() << ", " << getUpperName()
-         << ".data(), " << getLowerName() << "Length);";
-    }
-    void writeCtorInitializers(raw_ostream &OS) const {
-      OS << getLowerName() << "Length(" << getUpperName() << ".size()),"
-         << getLowerName() << "(new (Ctx, 1) char[" << getLowerName()
-         << "Length])";
-    }
-    void writeCtorParameters(raw_ostream &OS) const {
-      OS << "llvm::StringRef " << getUpperName();
-    }
-    void writeDeclarations(raw_ostream &OS) const {
-      OS << "unsigned " << getLowerName() << "Length;\n";
-      OS << "char *" << getLowerName() << ";";
-    }
-    void writePCHReadDecls(raw_ostream &OS) const {
-      OS << "    std::string " << getLowerName()
-         << "= ReadString(Record, Idx);\n";
-    }
-    void writePCHReadArgs(raw_ostream &OS) const {
-      OS << getLowerName();
-    }
-    void writePCHWrite(raw_ostream &OS) const {
-      OS << "    AddString(SA->get" << getUpperName() << "(), Record);\n";
-    }
-  };
-
-  class AlignedArgument : public Argument {
-  public:
-    AlignedArgument(Record &Arg, StringRef Attr)
-      : Argument(Arg, Attr)
-    {}
-
-    void writeAccessors(raw_ostream &OS) const {
-      OS << "  bool is" << getUpperName() << "Dependent() const;\n";
-
-      OS << "  unsigned get" << getUpperName() << "(ASTContext &Ctx) const;\n";
-
-      OS << "  bool is" << getUpperName() << "Expr() const {\n";
-      OS << "    return is" << getLowerName() << "Expr;\n";
-      OS << "  }\n";
-
-      OS << "  Expr *get" << getUpperName() << "Expr() const {\n";
-      OS << "    assert(is" << getLowerName() << "Expr);\n";
-      OS << "    return " << getLowerName() << "Expr;\n";
-      OS << "  }\n";
-
-      OS << "  TypeSourceInfo *get" << getUpperName() << "Type() const {\n";
-      OS << "    assert(!is" << getLowerName() << "Expr);\n";
-      OS << "    return " << getLowerName() << "Type;\n";
-      OS << "  }";
-    }
-    void writeAccessorDefinitions(raw_ostream &OS) const {
-      OS << "bool " << getAttrName() << "Attr::is" << getUpperName()
-         << "Dependent() const {\n";
-      OS << "  if (is" << getLowerName() << "Expr)\n";
-      OS << "    return " << getLowerName() << "Expr && (" << getLowerName()
-         << "Expr->isValueDependent() || " << getLowerName()
-         << "Expr->isTypeDependent());\n"; 
-      OS << "  else\n";
-      OS << "    return " << getLowerName()
-         << "Type->getType()->isDependentType();\n";
-      OS << "}\n";
-
-      // FIXME: Do not do the calculation here
-      // FIXME: Handle types correctly
-      // A null pointer means maximum alignment
-      // FIXME: Load the platform-specific maximum alignment, rather than
-      //        16, the x86 max.
-      OS << "unsigned " << getAttrName() << "Attr::get" << getUpperName()
-         << "(ASTContext &Ctx) const {\n";
-      OS << "  assert(!is" << getUpperName() << "Dependent());\n";
-      OS << "  if (is" << getLowerName() << "Expr)\n";
-      OS << "    return (" << getLowerName() << "Expr ? " << getLowerName()
-         << "Expr->EvaluateAsInt(Ctx).getZExtValue() : 16)"
-         << "* Ctx.getCharWidth();\n";
-      OS << "  else\n";
-      OS << "    return 0; // FIXME\n";
-      OS << "}\n";
-    }
-    void writeCloneArgs(raw_ostream &OS) const {
-      OS << "is" << getLowerName() << "Expr, is" << getLowerName()
-         << "Expr ? static_cast<void*>(" << getLowerName()
-         << "Expr) : " << getLowerName()
-         << "Type";
-    }
-    void writeCtorBody(raw_ostream &OS) const {
-      OS << "    if (is" << getLowerName() << "Expr)\n";
-      OS << "       " << getLowerName() << "Expr = reinterpret_cast<Expr *>("
-         << getUpperName() << ");\n";
-      OS << "    else\n";
-      OS << "       " << getLowerName()
-         << "Type = reinterpret_cast<TypeSourceInfo *>(" << getUpperName()
-         << ");";
-    }
-    void writeCtorInitializers(raw_ostream &OS) const {
-      OS << "is" << getLowerName() << "Expr(Is" << getUpperName() << "Expr)";
-    }
-    void writeCtorParameters(raw_ostream &OS) const {
-      OS << "bool Is" << getUpperName() << "Expr, void *" << getUpperName();
-    }
-    void writeDeclarations(raw_ostream &OS) const {
-      OS << "bool is" << getLowerName() << "Expr;\n";
-      OS << "union {\n";
-      OS << "Expr *" << getLowerName() << "Expr;\n";
-      OS << "TypeSourceInfo *" << getLowerName() << "Type;\n";
-      OS << "};";
-    }
-    void writePCHReadArgs(raw_ostream &OS) const {
-      OS << "is" << getLowerName() << "Expr, " << getLowerName() << "Ptr";
-    }
-    void writePCHReadDecls(raw_ostream &OS) const {
-      OS << "    bool is" << getLowerName() << "Expr = Record[Idx++];\n";
-      OS << "    void *" << getLowerName() << "Ptr;\n";
-      OS << "    if (is" << getLowerName() << "Expr)\n";
-      OS << "      " << getLowerName() << "Ptr = ReadExpr(F);\n";
-      OS << "    else\n";
-      OS << "      " << getLowerName()
-         << "Ptr = GetTypeSourceInfo(F, Record, Idx);\n";
-    }
-    void writePCHWrite(raw_ostream &OS) const {
-      OS << "    Record.push_back(SA->is" << getUpperName() << "Expr());\n";
-      OS << "    if (SA->is" << getUpperName() << "Expr())\n";
-      OS << "      AddStmt(SA->get" << getUpperName() << "Expr());\n";
-      OS << "    else\n";
-      OS << "      AddTypeSourceInfo(SA->get" << getUpperName()
-         << "Type(), Record);\n";
-    }
-  };
-
-  class VariadicArgument : public Argument {
-    std::string type;
-
-  public:
-    VariadicArgument(Record &Arg, StringRef Attr, std::string T)
-      : Argument(Arg, Attr), type(T)
-    {}
-
-    std::string getType() const { return type; }
-
-    void writeAccessors(raw_ostream &OS) const {
-      OS << "  typedef " << type << "* " << getLowerName() << "_iterator;\n";
-      OS << "  " << getLowerName() << "_iterator " << getLowerName()
-         << "_begin() const {\n";
-      OS << "    return " << getLowerName() << ";\n";
-      OS << "  }\n";
-      OS << "  " << getLowerName() << "_iterator " << getLowerName()
-         << "_end() const {\n";
-      OS << "    return " << getLowerName() << " + " << getLowerName()
-         << "Size;\n";
-      OS << "  }\n";
-      OS << "  unsigned " << getLowerName() << "_size() const {\n"
-         << "    return " << getLowerName() << "Size;\n;";
-      OS << "  }";
-    }
-    void writeCloneArgs(raw_ostream &OS) const {
-      OS << getLowerName() << ", " << getLowerName() << "Size";
-    }
-    void writeCtorBody(raw_ostream &OS) const {
-      // FIXME: memcpy is not safe on non-trivial types.
-      OS << "    std::memcpy(" << getLowerName() << ", " << getUpperName()
-         << ", " << getLowerName() << "Size * sizeof(" << getType() << "));\n";
-    }
-    void writeCtorInitializers(raw_ostream &OS) const {
-      OS << getLowerName() << "Size(" << getUpperName() << "Size), "
-         << getLowerName() << "(new (Ctx, 16) " << getType() << "["
-         << getLowerName() << "Size])";
-    }
-    void writeCtorParameters(raw_ostream &OS) const {
-      OS << getType() << " *" << getUpperName() << ", unsigned "
-         << getUpperName() << "Size";
-    }
-    void writeDeclarations(raw_ostream &OS) const {
-      OS << "  unsigned " << getLowerName() << "Size;\n";
-      OS << "  " << getType() << " *" << getLowerName() << ";";
-    }
-    void writePCHReadDecls(raw_ostream &OS) const {
-      OS << "  unsigned " << getLowerName() << "Size = Record[Idx++];\n";
-      OS << "  llvm::SmallVector<" << type << ", 4> " << getLowerName()
-         << ";\n";
-      OS << "  " << getLowerName() << ".reserve(" << getLowerName()
-         << "Size);\n";
-      OS << "  for (unsigned i = " << getLowerName() << "Size; i; --i)\n";
-      
-      std::string read = ReadPCHRecord(type);
-      OS << "    " << getLowerName() << ".push_back(" << read << ");\n";
-    }
-    void writePCHReadArgs(raw_ostream &OS) const {
-      OS << getLowerName() << ".data(), " << getLowerName() << "Size";
-    }
-    void writePCHWrite(raw_ostream &OS) const{
-      OS << "    Record.push_back(SA->" << getLowerName() << "_size());\n";
-      OS << "    for (" << getAttrName() << "Attr::" << getLowerName()
-         << "_iterator i = SA->" << getLowerName() << "_begin(), e = SA->"
-         << getLowerName() << "_end(); i != e; ++i)\n";
-      OS << "      " << WritePCHRecord(type, "(*i)");
-    }
-  };
-
-  class EnumArgument : public Argument {
-    std::string type;
-    std::vector<StringRef> values, enums;
-  public:
-    EnumArgument(Record &Arg, StringRef Attr)
-      : Argument(Arg, Attr), type(Arg.getValueAsString("Type")),
-        values(getValueAsListOfStrings(Arg, "Values")),
-        enums(getValueAsListOfStrings(Arg, "Enums"))
-    {}
-
-    void writeAccessors(raw_ostream &OS) const {
-      OS << "  " << type << " get" << getUpperName() << "() const {\n";
-      OS << "    return " << getLowerName() << ";\n";
-      OS << "  }";
-    }
-    void writeCloneArgs(raw_ostream &OS) const {
-      OS << getLowerName();
-    }
-    void writeCtorInitializers(raw_ostream &OS) const {
-      OS << getLowerName() << "(" << getUpperName() << ")";
-    }
-    void writeCtorParameters(raw_ostream &OS) const {
-      OS << type << " " << getUpperName();
-    }
-    void writeDeclarations(raw_ostream &OS) const {
-      // Calculate the various enum values
-      std::vector<StringRef> uniques(enums);
-      std::sort(uniques.begin(), uniques.end());
-      uniques.erase(std::unique(uniques.begin(), uniques.end()),
-                    uniques.end());
-      // FIXME: Emit a proper error
-      assert(!uniques.empty());
-
-      std::vector<StringRef>::iterator i = uniques.begin(),
-                                       e = uniques.end();
-      // The last one needs to not have a comma.
-      --e;
-
-      OS << "public:\n";
-      OS << "  enum " << type << " {\n";
-      for (; i != e; ++i)
-        OS << "    " << *i << ",\n";
-      OS << "    " << *e << "\n";
-      OS << "  };\n";
-      OS << "private:\n";
-      OS << "  " << type << " " << getLowerName() << ";";
-    }
-    void writePCHReadDecls(raw_ostream &OS) const {
-      OS << "    " << getAttrName() << "Attr::" << type << " " << getLowerName()
-         << "(static_cast<" << getAttrName() << "Attr::" << type
-         << ">(Record[Idx++]));\n";
-    }
-    void writePCHReadArgs(raw_ostream &OS) const {
-      OS << getLowerName();
-    }
-    void writePCHWrite(raw_ostream &OS) const {
-      OS << "Record.push_back(SA->get" << getUpperName() << "());\n";
-    }
-  };
-
-  class VersionArgument : public Argument {
-  public:
-    VersionArgument(Record &Arg, StringRef Attr)
-      : Argument(Arg, Attr)
-    {}
-
-    void writeAccessors(raw_ostream &OS) const {
-      OS << "  VersionTuple get" << getUpperName() << "() const {\n";
-      OS << "    return " << getLowerName() << ";\n";
-      OS << "  }\n";
-      OS << "  void set" << getUpperName() 
-         << "(ASTContext &C, VersionTuple V) {\n";
-      OS << "    " << getLowerName() << " = V;\n";
-      OS << "  }";
-    }
-    void writeCloneArgs(raw_ostream &OS) const {
-      OS << "get" << getUpperName() << "()";
-    }
-    void writeCtorBody(raw_ostream &OS) const {
-    }
-    void writeCtorInitializers(raw_ostream &OS) const {
-      OS << getLowerName() << "(" << getUpperName() << ")";
-    }
-    void writeCtorParameters(raw_ostream &OS) const {
-      OS << "VersionTuple " << getUpperName();
-    }
-    void writeDeclarations(raw_ostream &OS) const {
-      OS << "VersionTuple " << getLowerName() << ";\n";
-    }
-    void writePCHReadDecls(raw_ostream &OS) const {
-      OS << "    VersionTuple " << getLowerName()
-         << "= ReadVersionTuple(Record, Idx);\n";
-    }
-    void writePCHReadArgs(raw_ostream &OS) const {
-      OS << getLowerName();
-    }
-    void writePCHWrite(raw_ostream &OS) const {
-      OS << "    AddVersionTuple(SA->get" << getUpperName() << "(), Record);\n";
-    }
-  };
-}
-
-static Argument *createArgument(Record &Arg, StringRef Attr,
-                                Record *Search = 0) {
-  if (!Search)
-    Search = &Arg;
-
-  Argument *Ptr = 0;
-  llvm::StringRef ArgName = Search->getName();
-
-  if (ArgName == "AlignedArgument") Ptr = new AlignedArgument(Arg, Attr);
-  else if (ArgName == "EnumArgument") Ptr = new EnumArgument(Arg, Attr);
-  else if (ArgName == "ExprArgument") Ptr = new SimpleArgument(Arg, Attr,
-                                                               "Expr *");
-  else if (ArgName == "FunctionArgument")
-    Ptr = new SimpleArgument(Arg, Attr, "FunctionDecl *");
-  else if (ArgName == "IdentifierArgument")
-    Ptr = new SimpleArgument(Arg, Attr, "IdentifierInfo *");
-  else if (ArgName == "BoolArgument") Ptr = new SimpleArgument(Arg, Attr, 
-                                                               "bool");
-  else if (ArgName == "IntArgument") Ptr = new SimpleArgument(Arg, Attr, "int");
-  else if (ArgName == "StringArgument") Ptr = new StringArgument(Arg, Attr);
-  else if (ArgName == "TypeArgument")
-    Ptr = new SimpleArgument(Arg, Attr, "QualType");
-  else if (ArgName == "UnsignedArgument")
-    Ptr = new SimpleArgument(Arg, Attr, "unsigned");
-  else if (ArgName == "SourceLocArgument")
-    Ptr = new SimpleArgument(Arg, Attr, "SourceLocation");
-  else if (ArgName == "VariadicUnsignedArgument")
-    Ptr = new VariadicArgument(Arg, Attr, "unsigned");
-  else if (ArgName == "VariadicExprArgument")
-    Ptr = new VariadicArgument(Arg, Attr, "Expr *");
-  else if (ArgName == "VersionArgument")
-    Ptr = new VersionArgument(Arg, Attr);
-
-  if (!Ptr) {
-    std::vector<Record*> Bases = Search->getSuperClasses();
-    for (std::vector<Record*>::iterator i = Bases.begin(), e = Bases.end();
-         i != e; ++i) {
-      Ptr = createArgument(Arg, Attr, *i);
-      if (Ptr)
-        break;
-    }
-  }
-  return Ptr;
-}
-
-void ClangAttrClassEmitter::run(raw_ostream &OS) {
-  OS << "// This file is generated by TableGen. Do not edit.\n\n";
-  OS << "#ifndef LLVM_CLANG_ATTR_CLASSES_INC\n";
-  OS << "#define LLVM_CLANG_ATTR_CLASSES_INC\n\n";
-
-  std::vector<Record*> Attrs = Records.getAllDerivedDefinitions("Attr");
-
-  for (std::vector<Record*>::iterator i = Attrs.begin(), e = Attrs.end();
-       i != e; ++i) {
-    Record &R = **i;
-    const std::string &SuperName = R.getSuperClasses().back()->getName();
-
-    OS << "class " << R.getName() << "Attr : public " << SuperName << " {\n";
-
-    std::vector<Record*> ArgRecords = R.getValueAsListOfDefs("Args");
-    std::vector<Argument*> Args;
-    std::vector<Argument*>::iterator ai, ae;
-    Args.reserve(ArgRecords.size());
-
-    for (std::vector<Record*>::iterator ri = ArgRecords.begin(),
-                                        re = ArgRecords.end();
-         ri != re; ++ri) {
-      Record &ArgRecord = **ri;
-      Argument *Arg = createArgument(ArgRecord, R.getName());
-      assert(Arg);
-      Args.push_back(Arg);
-
-      Arg->writeDeclarations(OS);
-      OS << "\n\n";
-    }
-
-    ae = Args.end();
-
-    OS << "\n public:\n";
-    OS << "  " << R.getName() << "Attr(SourceRange R, ASTContext &Ctx\n";