[llvm] r211100 - Move SetTheory from utils/TableGen into lib/TableGen so Clang can use it.

James Molloy james.molloy at arm.com
Tue Jun 17 06:10:38 PDT 2014


Author: jamesm
Date: Tue Jun 17 08:10:38 2014
New Revision: 211100

URL: http://llvm.org/viewvc/llvm-project?rev=211100&view=rev
Log:
Move SetTheory from utils/TableGen into lib/TableGen so Clang can use it.

Added:
    llvm/trunk/include/llvm/TableGen/SetTheory.h
      - copied, changed from r211097, llvm/trunk/utils/TableGen/SetTheory.h
    llvm/trunk/lib/TableGen/SetTheory.cpp
      - copied, changed from r211097, llvm/trunk/utils/TableGen/SetTheory.cpp
Removed:
    llvm/trunk/utils/TableGen/SetTheory.cpp
    llvm/trunk/utils/TableGen/SetTheory.h
Modified:
    llvm/trunk/lib/TableGen/CMakeLists.txt
    llvm/trunk/utils/TableGen/CMakeLists.txt
    llvm/trunk/utils/TableGen/CodeGenRegisters.h
    llvm/trunk/utils/TableGen/CodeGenSchedule.h
    llvm/trunk/utils/TableGen/TableGen.cpp

Copied: llvm/trunk/include/llvm/TableGen/SetTheory.h (from r211097, llvm/trunk/utils/TableGen/SetTheory.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TableGen/SetTheory.h?p2=llvm/trunk/include/llvm/TableGen/SetTheory.h&p1=llvm/trunk/utils/TableGen/SetTheory.h&r1=211097&r2=211100&rev=211100&view=diff
==============================================================================
    (empty)

Modified: llvm/trunk/lib/TableGen/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/CMakeLists.txt?rev=211100&r1=211099&r2=211100&view=diff
==============================================================================
--- llvm/trunk/lib/TableGen/CMakeLists.txt (original)
+++ llvm/trunk/lib/TableGen/CMakeLists.txt Tue Jun 17 08:10:38 2014
@@ -2,6 +2,7 @@ add_llvm_library(LLVMTableGen
   Error.cpp
   Main.cpp
   Record.cpp
+  SetTheory.cpp
   StringMatcher.cpp
   TableGenBackend.cpp
   TGLexer.cpp

Copied: llvm/trunk/lib/TableGen/SetTheory.cpp (from r211097, llvm/trunk/utils/TableGen/SetTheory.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/SetTheory.cpp?p2=llvm/trunk/lib/TableGen/SetTheory.cpp&p1=llvm/trunk/utils/TableGen/SetTheory.cpp&r1=211097&r2=211100&rev=211100&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/SetTheory.cpp (original)
+++ llvm/trunk/lib/TableGen/SetTheory.cpp Tue Jun 17 08:10:38 2014
@@ -12,10 +12,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SetTheory.h"
 #include "llvm/Support/Format.h"
 #include "llvm/TableGen/Error.h"
 #include "llvm/TableGen/Record.h"
+#include "llvm/TableGen/SetTheory.h"
 
 using namespace llvm;
 

Modified: llvm/trunk/utils/TableGen/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/CMakeLists.txt?rev=211100&r1=211099&r2=211100&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/CMakeLists.txt (original)
+++ llvm/trunk/utils/TableGen/CMakeLists.txt Tue Jun 17 08:10:38 2014
@@ -26,7 +26,6 @@ add_tablegen(llvm-tblgen LLVM
   OptParserEmitter.cpp
   PseudoLoweringEmitter.cpp
   RegisterInfoEmitter.cpp
-  SetTheory.cpp
   SubtargetEmitter.cpp
   TableGen.cpp
   X86DisassemblerTables.cpp

Modified: llvm/trunk/utils/TableGen/CodeGenRegisters.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/CodeGenRegisters.h?rev=211100&r1=211099&r2=211100&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/CodeGenRegisters.h (original)
+++ llvm/trunk/utils/TableGen/CodeGenRegisters.h Tue Jun 17 08:10:38 2014
@@ -15,7 +15,6 @@
 #ifndef CODEGEN_REGISTERS_H
 #define CODEGEN_REGISTERS_H
 
-#include "SetTheory.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/BitVector.h"
 #include "llvm/ADT/DenseMap.h"
@@ -23,6 +22,7 @@
 #include "llvm/CodeGen/MachineValueType.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/TableGen/Record.h"
+#include "llvm/TableGen/SetTheory.h"
 #include <cstdlib>
 #include <map>
 #include <set>

Modified: llvm/trunk/utils/TableGen/CodeGenSchedule.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/CodeGenSchedule.h?rev=211100&r1=211099&r2=211100&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/CodeGenSchedule.h (original)
+++ llvm/trunk/utils/TableGen/CodeGenSchedule.h Tue Jun 17 08:10:38 2014
@@ -15,11 +15,11 @@
 #ifndef CODEGEN_SCHEDULE_H
 #define CODEGEN_SCHEDULE_H
 
-#include "SetTheory.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/TableGen/Record.h"
+#include "llvm/TableGen/SetTheory.h"
 
 namespace llvm {
 

Removed: llvm/trunk/utils/TableGen/SetTheory.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/SetTheory.cpp?rev=211099&view=auto
==============================================================================
--- llvm/trunk/utils/TableGen/SetTheory.cpp (original)
+++ llvm/trunk/utils/TableGen/SetTheory.cpp (removed)
@@ -1,323 +0,0 @@
-//===- SetTheory.cpp - Generate ordered sets from DAG expressions ---------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the SetTheory class that computes ordered sets of
-// Records from DAG expressions.
-//
-//===----------------------------------------------------------------------===//
-
-#include "SetTheory.h"
-#include "llvm/Support/Format.h"
-#include "llvm/TableGen/Error.h"
-#include "llvm/TableGen/Record.h"
-
-using namespace llvm;
-
-// Define the standard operators.
-namespace {
-
-typedef SetTheory::RecSet RecSet;
-typedef SetTheory::RecVec RecVec;
-
-// (add a, b, ...) Evaluate and union all arguments.
-struct AddOp : public SetTheory::Operator {
-  void apply(SetTheory &ST, DagInit *Expr, RecSet &Elts,
-             ArrayRef<SMLoc> Loc) override {
-    ST.evaluate(Expr->arg_begin(), Expr->arg_end(), Elts, Loc);
-  }
-};
-
-// (sub Add, Sub, ...) Set difference.
-struct SubOp : public SetTheory::Operator {
-  void apply(SetTheory &ST, DagInit *Expr, RecSet &Elts,
-             ArrayRef<SMLoc> Loc) override {
-    if (Expr->arg_size() < 2)
-      PrintFatalError(Loc, "Set difference needs at least two arguments: " +
-        Expr->getAsString());
-    RecSet Add, Sub;
-    ST.evaluate(*Expr->arg_begin(), Add, Loc);
-    ST.evaluate(Expr->arg_begin() + 1, Expr->arg_end(), Sub, Loc);
-    for (RecSet::iterator I = Add.begin(), E = Add.end(); I != E; ++I)
-      if (!Sub.count(*I))
-        Elts.insert(*I);
-  }
-};
-
-// (and S1, S2) Set intersection.
-struct AndOp : public SetTheory::Operator {
-  void apply(SetTheory &ST, DagInit *Expr, RecSet &Elts,
-             ArrayRef<SMLoc> Loc) override {
-    if (Expr->arg_size() != 2)
-      PrintFatalError(Loc, "Set intersection requires two arguments: " +
-        Expr->getAsString());
-    RecSet S1, S2;
-    ST.evaluate(Expr->arg_begin()[0], S1, Loc);
-    ST.evaluate(Expr->arg_begin()[1], S2, Loc);
-    for (RecSet::iterator I = S1.begin(), E = S1.end(); I != E; ++I)
-      if (S2.count(*I))
-        Elts.insert(*I);
-  }
-};
-
-// SetIntBinOp - Abstract base class for (Op S, N) operators.
-struct SetIntBinOp : public SetTheory::Operator {
-  virtual void apply2(SetTheory &ST, DagInit *Expr, RecSet &Set, int64_t N,
-                      RecSet &Elts, ArrayRef<SMLoc> Loc) = 0;
-
-  void apply(SetTheory &ST, DagInit *Expr, RecSet &Elts,
-             ArrayRef<SMLoc> Loc) override {
-    if (Expr->arg_size() != 2)
-      PrintFatalError(Loc, "Operator requires (Op Set, Int) arguments: " +
-        Expr->getAsString());
-    RecSet Set;
-    ST.evaluate(Expr->arg_begin()[0], Set, Loc);
-    IntInit *II = dyn_cast<IntInit>(Expr->arg_begin()[1]);
-    if (!II)
-      PrintFatalError(Loc, "Second argument must be an integer: " +
-        Expr->getAsString());
-    apply2(ST, Expr, Set, II->getValue(), Elts, Loc);
-  }
-};
-
-// (shl S, N) Shift left, remove the first N elements.
-struct ShlOp : public SetIntBinOp {
-  void apply2(SetTheory &ST, DagInit *Expr, RecSet &Set, int64_t N,
-              RecSet &Elts, ArrayRef<SMLoc> Loc) override {
-    if (N < 0)
-      PrintFatalError(Loc, "Positive shift required: " +
-        Expr->getAsString());
-    if (unsigned(N) < Set.size())
-      Elts.insert(Set.begin() + N, Set.end());
-  }
-};
-
-// (trunc S, N) Truncate after the first N elements.
-struct TruncOp : public SetIntBinOp {
-  void apply2(SetTheory &ST, DagInit *Expr, RecSet &Set, int64_t N,
-              RecSet &Elts, ArrayRef<SMLoc> Loc) override {
-    if (N < 0)
-      PrintFatalError(Loc, "Positive length required: " +
-        Expr->getAsString());
-    if (unsigned(N) > Set.size())
-      N = Set.size();
-    Elts.insert(Set.begin(), Set.begin() + N);
-  }
-};
-
-// Left/right rotation.
-struct RotOp : public SetIntBinOp {
-  const bool Reverse;
-
-  RotOp(bool Rev) : Reverse(Rev) {}
-
-  void apply2(SetTheory &ST, DagInit *Expr, RecSet &Set, int64_t N,
-              RecSet &Elts, ArrayRef<SMLoc> Loc) override {
-    if (Reverse)
-      N = -N;
-    // N > 0 -> rotate left, N < 0 -> rotate right.
-    if (Set.empty())
-      return;
-    if (N < 0)
-      N = Set.size() - (-N % Set.size());
-    else
-      N %= Set.size();
-    Elts.insert(Set.begin() + N, Set.end());
-    Elts.insert(Set.begin(), Set.begin() + N);
-  }
-};
-
-// (decimate S, N) Pick every N'th element of S.
-struct DecimateOp : public SetIntBinOp {
-  void apply2(SetTheory &ST, DagInit *Expr, RecSet &Set, int64_t N,
-              RecSet &Elts, ArrayRef<SMLoc> Loc) override {
-    if (N <= 0)
-      PrintFatalError(Loc, "Positive stride required: " +
-        Expr->getAsString());
-    for (unsigned I = 0; I < Set.size(); I += N)
-      Elts.insert(Set[I]);
-  }
-};
-
-// (interleave S1, S2, ...) Interleave elements of the arguments.
-struct InterleaveOp : public SetTheory::Operator {
-  void apply(SetTheory &ST, DagInit *Expr, RecSet &Elts,
-             ArrayRef<SMLoc> Loc) override {
-    // Evaluate the arguments individually.
-    SmallVector<RecSet, 4> Args(Expr->getNumArgs());
-    unsigned MaxSize = 0;
-    for (unsigned i = 0, e = Expr->getNumArgs(); i != e; ++i) {
-      ST.evaluate(Expr->getArg(i), Args[i], Loc);
-      MaxSize = std::max(MaxSize, unsigned(Args[i].size()));
-    }
-    // Interleave arguments into Elts.
-    for (unsigned n = 0; n != MaxSize; ++n)
-      for (unsigned i = 0, e = Expr->getNumArgs(); i != e; ++i)
-        if (n < Args[i].size())
-          Elts.insert(Args[i][n]);
-  }
-};
-
-// (sequence "Format", From, To) Generate a sequence of records by name.
-struct SequenceOp : public SetTheory::Operator {
-  void apply(SetTheory &ST, DagInit *Expr, RecSet &Elts,
-             ArrayRef<SMLoc> Loc) override {
-    int Step = 1;
-    if (Expr->arg_size() > 4)
-      PrintFatalError(Loc, "Bad args to (sequence \"Format\", From, To): " +
-        Expr->getAsString());
-    else if (Expr->arg_size() == 4) {
-      if (IntInit *II = dyn_cast<IntInit>(Expr->arg_begin()[3])) {
-        Step = II->getValue();
-      } else
-        PrintFatalError(Loc, "Stride must be an integer: " +
-          Expr->getAsString());
-    }
-
-    std::string Format;
-    if (StringInit *SI = dyn_cast<StringInit>(Expr->arg_begin()[0]))
-      Format = SI->getValue();
-    else
-      PrintFatalError(Loc,  "Format must be a string: " + Expr->getAsString());
-
-    int64_t From, To;
-    if (IntInit *II = dyn_cast<IntInit>(Expr->arg_begin()[1]))
-      From = II->getValue();
-    else
-      PrintFatalError(Loc, "From must be an integer: " + Expr->getAsString());
-    if (From < 0 || From >= (1 << 30))
-      PrintFatalError(Loc, "From out of range");
-
-    if (IntInit *II = dyn_cast<IntInit>(Expr->arg_begin()[2]))
-      To = II->getValue();
-    else
-      PrintFatalError(Loc, "From must be an integer: " + Expr->getAsString());
-    if (To < 0 || To >= (1 << 30))
-      PrintFatalError(Loc, "To out of range");
-
-    RecordKeeper &Records =
-      cast<DefInit>(Expr->getOperator())->getDef()->getRecords();
-
-    Step *= From <= To ? 1 : -1;
-    while (true) {
-      if (Step > 0 && From > To)
-        break;
-      else if (Step < 0 && From < To)
-        break;
-      std::string Name;
-      raw_string_ostream OS(Name);
-      OS << format(Format.c_str(), unsigned(From));
-      Record *Rec = Records.getDef(OS.str());
-      if (!Rec)
-        PrintFatalError(Loc, "No def named '" + Name + "': " +
-          Expr->getAsString());
-      // Try to reevaluate Rec in case it is a set.
-      if (const RecVec *Result = ST.expand(Rec))
-        Elts.insert(Result->begin(), Result->end());
-      else
-        Elts.insert(Rec);
-
-      From += Step;
-    }
-  }
-};
-
-// Expand a Def into a set by evaluating one of its fields.
-struct FieldExpander : public SetTheory::Expander {
-  StringRef FieldName;
-
-  FieldExpander(StringRef fn) : FieldName(fn) {}
-
-  void expand(SetTheory &ST, Record *Def, RecSet &Elts) override {
-    ST.evaluate(Def->getValueInit(FieldName), Elts, Def->getLoc());
-  }
-};
-} // end anonymous namespace
-
-// Pin the vtables to this file.
-void SetTheory::Operator::anchor() {}
-void SetTheory::Expander::anchor() {}
-
-
-SetTheory::SetTheory() {
-  addOperator("add", new AddOp);
-  addOperator("sub", new SubOp);
-  addOperator("and", new AndOp);
-  addOperator("shl", new ShlOp);
-  addOperator("trunc", new TruncOp);
-  addOperator("rotl", new RotOp(false));
-  addOperator("rotr", new RotOp(true));
-  addOperator("decimate", new DecimateOp);
-  addOperator("interleave", new InterleaveOp);
-  addOperator("sequence", new SequenceOp);
-}
-
-void SetTheory::addOperator(StringRef Name, Operator *Op) {
-  Operators[Name] = Op;
-}
-
-void SetTheory::addExpander(StringRef ClassName, Expander *E) {
-  Expanders[ClassName] = E;
-}
-
-void SetTheory::addFieldExpander(StringRef ClassName, StringRef FieldName) {
-  addExpander(ClassName, new FieldExpander(FieldName));
-}
-
-void SetTheory::evaluate(Init *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc) {
-  // A def in a list can be a just an element, or it may expand.
-  if (DefInit *Def = dyn_cast<DefInit>(Expr)) {
-    if (const RecVec *Result = expand(Def->getDef()))
-      return Elts.insert(Result->begin(), Result->end());
-    Elts.insert(Def->getDef());
-    return;
-  }
-
-  // Lists simply expand.
-  if (ListInit *LI = dyn_cast<ListInit>(Expr))
-    return evaluate(LI->begin(), LI->end(), Elts, Loc);
-
-  // Anything else must be a DAG.
-  DagInit *DagExpr = dyn_cast<DagInit>(Expr);
-  if (!DagExpr)
-    PrintFatalError(Loc, "Invalid set element: " + Expr->getAsString());
-  DefInit *OpInit = dyn_cast<DefInit>(DagExpr->getOperator());
-  if (!OpInit)
-    PrintFatalError(Loc, "Bad set expression: " + Expr->getAsString());
-  Operator *Op = Operators.lookup(OpInit->getDef()->getName());
-  if (!Op)
-    PrintFatalError(Loc, "Unknown set operator: " + Expr->getAsString());
-  Op->apply(*this, DagExpr, Elts, Loc);
-}
-
-const RecVec *SetTheory::expand(Record *Set) {
-  // Check existing entries for Set and return early.
-  ExpandMap::iterator I = Expansions.find(Set);
-  if (I != Expansions.end())
-    return &I->second;
-
-  // This is the first time we see Set. Find a suitable expander.
-  const std::vector<Record*> &SC = Set->getSuperClasses();
-  for (unsigned i = 0, e = SC.size(); i != e; ++i) {
-    // Skip unnamed superclasses.
-    if (!dyn_cast<StringInit>(SC[i]->getNameInit()))
-      continue;
-    if (Expander *Exp = Expanders.lookup(SC[i]->getName())) {
-      // This breaks recursive definitions.
-      RecVec &EltVec = Expansions[Set];
-      RecSet Elts;
-      Exp->expand(*this, Set, Elts);
-      EltVec.assign(Elts.begin(), Elts.end());
-      return &EltVec;
-    }
-  }
-
-  // Set is not expandable.
-  return nullptr;
-}
-

Removed: llvm/trunk/utils/TableGen/SetTheory.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/SetTheory.h?rev=211099&view=auto
==============================================================================
--- llvm/trunk/utils/TableGen/SetTheory.h (original)
+++ llvm/trunk/utils/TableGen/SetTheory.h (removed)
@@ -1,142 +0,0 @@
-//===- SetTheory.h - Generate ordered sets from DAG expressions -*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the SetTheory class that computes ordered sets of
-// Records from DAG expressions.  Operators for standard set operations are
-// predefined, and it is possible to add special purpose set operators as well.
-//
-// The user may define named sets as Records of predefined classes. Set
-// expanders can be added to a SetTheory instance to teach it how to find the
-// elements of such a named set.
-//
-// These are the predefined operators. The argument lists can be individual
-// elements (defs), other sets (defs of expandable classes), lists, or DAG
-// expressions that are evaluated recursively.
-//
-// - (add S1, S2 ...) Union sets. This is also how sets are created from element
-//   lists.
-//
-// - (sub S1, S2, ...) Set difference. Every element in S1 except for the
-//   elements in S2, ...
-//
-// - (and S1, S2) Set intersection. Every element in S1 that is also in S2.
-//
-// - (shl S, N) Shift left. Remove the first N elements from S.
-//
-// - (trunc S, N) Truncate. The first N elements of S.
-//
-// - (rotl S, N) Rotate left. Same as (add (shl S, N), (trunc S, N)).
-//
-// - (rotr S, N) Rotate right.
-//
-// - (decimate S, N) Decimate S by picking every N'th element, starting with
-//   the first one. For instance, (decimate S, 2) returns the even elements of
-//   S.
-//
-// - (sequence "Format", From, To) Generate a sequence of defs with printf.
-//   For instance, (sequence "R%u", 0, 3) -> [ R0, R1, R2, R3 ]
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SETTHEORY_H
-#define SETTHEORY_H
-
-#include "llvm/ADT/SetVector.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/Support/SourceMgr.h"
-#include <map>
-#include <vector>
-
-namespace llvm {
-
-class DagInit;
-class Init;
-class Record;
-class RecordKeeper;
-
-class SetTheory {
-public:
-  typedef std::vector<Record*> RecVec;
-  typedef SmallSetVector<Record*, 16> RecSet;
-
-  /// Operator - A callback representing a DAG operator.
-  class Operator {
-    virtual void anchor();
-  public:
-    virtual ~Operator() {}
-
-    /// apply - Apply this operator to Expr's arguments and insert the result
-    /// in Elts.
-    virtual void apply(SetTheory&, DagInit *Expr, RecSet &Elts,
-                       ArrayRef<SMLoc> Loc) =0;
-  };
-
-  /// Expander - A callback function that can transform a Record representing a
-  /// set into a fully expanded list of elements. Expanders provide a way for
-  /// users to define named sets that can be used in DAG expressions.
-  class Expander {
-    virtual void anchor();
-  public:
-    virtual ~Expander() {}
-
-    virtual void expand(SetTheory&, Record*, RecSet &Elts) =0;
-  };
-
-private:
-  // Map set defs to their fully expanded contents. This serves as a memoization
-  // cache and it makes it possible to return const references on queries.
-  typedef std::map<Record*, RecVec> ExpandMap;
-  ExpandMap Expansions;
-
-  // Known DAG operators by name.
-  StringMap<Operator*> Operators;
-
-  // Typed expanders by class name.
-  StringMap<Expander*> Expanders;
-
-public:
-  /// Create a SetTheory instance with only the standard operators.
-  SetTheory();
-
-  /// addExpander - Add an expander for Records with the named super class.
-  void addExpander(StringRef ClassName, Expander*);
-
-  /// addFieldExpander - Add an expander for ClassName that simply evaluates
-  /// FieldName in the Record to get the set elements.  That is all that is
-  /// needed for a class like:
-  ///
-  ///   class Set<dag d> {
-  ///     dag Elts = d;
-  ///   }
-  ///
-  void addFieldExpander(StringRef ClassName, StringRef FieldName);
-
-  /// addOperator - Add a DAG operator.
-  void addOperator(StringRef Name, Operator*);
-
-  /// evaluate - Evaluate Expr and append the resulting set to Elts.
-  void evaluate(Init *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc);
-
-  /// evaluate - Evaluate a sequence of Inits and append to Elts.
-  template<typename Iter>
-  void evaluate(Iter begin, Iter end, RecSet &Elts, ArrayRef<SMLoc> Loc) {
-    while (begin != end)
-      evaluate(*begin++, Elts, Loc);
-  }
-
-  /// expand - Expand a record into a set of elements if possible.  Return a
-  /// pointer to the expanded elements, or NULL if Set cannot be expanded
-  /// further.
-  const RecVec *expand(Record *Set);
-};
-
-} // end namespace llvm
-
-#endif
-

Modified: llvm/trunk/utils/TableGen/TableGen.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/TableGen.cpp?rev=211100&r1=211099&r2=211100&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/TableGen.cpp (original)
+++ llvm/trunk/utils/TableGen/TableGen.cpp Tue Jun 17 08:10:38 2014
@@ -12,13 +12,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "TableGenBackends.h" // Declares all backends.
-#include "SetTheory.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/TableGen/Error.h"
 #include "llvm/TableGen/Main.h"
 #include "llvm/TableGen/Record.h"
+#include "llvm/TableGen/SetTheory.h"
 
 using namespace llvm;
 





More information about the llvm-commits mailing list