diff options
author | Eric Christopher <echristo@apple.com> | 2011-07-11 23:06:52 +0000 |
---|---|---|
committer | Eric Christopher <echristo@apple.com> | 2011-07-11 23:06:52 +0000 |
commit | d568b3f55294917d1cc701da14a8a7daeb6563e6 (patch) | |
tree | 44a2842bc0b635140d86fc4c7896e4ca1e2a6d87 /utils/TableGen/TGParser.h | |
parent | d1c2bd8e6e37e08393f7c4980efc5bcb66b6f0d0 (diff) | |
download | external_llvm-d568b3f55294917d1cc701da14a8a7daeb6563e6.zip external_llvm-d568b3f55294917d1cc701da14a8a7daeb6563e6.tar.gz external_llvm-d568b3f55294917d1cc701da14a8a7daeb6563e6.tar.bz2 |
Revert r134921, 134917, 134908 and 134907. They're causing failures
in multiple buildbots.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134936 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/TableGen/TGParser.h')
-rw-r--r-- | utils/TableGen/TGParser.h | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/utils/TableGen/TGParser.h b/utils/TableGen/TGParser.h index 82a8a8c..94a1c2b 100644 --- a/utils/TableGen/TGParser.h +++ b/utils/TableGen/TGParser.h @@ -25,7 +25,7 @@ namespace llvm { class RecordVal; class RecordKeeper; struct RecTy; - class Init; + struct Init; struct MultiClass; struct SubClassReference; struct SubMultiClassReference; @@ -33,10 +33,10 @@ namespace llvm { struct LetRecord { std::string Name; std::vector<unsigned> Bits; - const Init *Value; + Init *Value; SMLoc Loc; - LetRecord(const std::string &N, const std::vector<unsigned> &B, - const Init *V, SMLoc L) + LetRecord(const std::string &N, const std::vector<unsigned> &B, Init *V, + SMLoc L) : Name(N), Bits(B), Value(V), Loc(L) { } }; @@ -73,7 +73,7 @@ public: private: // Semantic analysis methods. bool AddValue(Record *TheRec, SMLoc Loc, const RecordVal &RV); bool SetValue(Record *TheRec, SMLoc Loc, const std::string &ValName, - const std::vector<unsigned> &BitList, const Init *V); + const std::vector<unsigned> &BitList, Init *V); bool AddSubClass(Record *Rec, SubClassReference &SubClass); bool AddSubMultiClass(MultiClass *CurMC, SubMultiClassReference &SubMultiClass); @@ -98,20 +98,18 @@ private: // Parser methods. SubClassReference ParseSubClassReference(Record *CurRec, bool isDefm); SubMultiClassReference ParseSubMultiClassReference(MultiClass *CurMC); - const Init *ParseIDValue(Record *CurRec); - const Init *ParseIDValue(Record *CurRec, const std::string &Name, - SMLoc NameLoc); - const Init *ParseSimpleValue(Record *CurRec, RecTy *ItemType = 0); - const Init *ParseValue(Record *CurRec, RecTy *ItemType = 0); - std::vector<const Init*> ParseValueList(Record *CurRec, Record *ArgsRec = 0, - RecTy *EltTy = 0); - std::vector<std::pair<const Init*, std::string> > ParseDagArgList(Record *); + Init *ParseIDValue(Record *CurRec); + Init *ParseIDValue(Record *CurRec, const std::string &Name, SMLoc NameLoc); + Init *ParseSimpleValue(Record *CurRec, RecTy *ItemType = 0); + Init *ParseValue(Record *CurRec, RecTy *ItemType = 0); + std::vector<Init*> ParseValueList(Record *CurRec, Record *ArgsRec = 0, RecTy *EltTy = 0); + std::vector<std::pair<llvm::Init*, std::string> > ParseDagArgList(Record *); bool ParseOptionalRangeList(std::vector<unsigned> &Ranges); bool ParseOptionalBitList(std::vector<unsigned> &Ranges); std::vector<unsigned> ParseRangeList(); bool ParseRangePiece(std::vector<unsigned> &Ranges); RecTy *ParseType(); - const Init *ParseOperation(Record *CurRec); + Init *ParseOperation(Record *CurRec); RecTy *ParseOperatorType(); std::string ParseObjectName(); Record *ParseClassID(); |