maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make VarInit Name an Init 

Make the VarInit name an Init itself.  We need this to implement paste
functionality so we can reference variables whose names are not yet
completely resolved.

llvm-svn: 142497
This commit is contained in:
David Greene 2011-10-19 13:02:33 +00:00
parent 28438acd46
commit 914adf0ecb
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/include/llvm/TableGen/Record.h
View File

@ -1058,9 +1058,11 @@ public:
/// VarInit - 'Opcode' - Represent a reference to an entire variable object.
///
class VarInit : public TypedInit {
std::string VarName;
Init *VarName;
explicit VarInit(const std::string &VN, RecTy *T)
: TypedInit(T), VarName(StringInit::get(VN)) {}
explicit VarInit(Init *VN, RecTy *T)
: TypedInit(T), VarName(VN) {}
VarInit(const VarInit &Other); // Do not define.
@ -1074,7 +1076,11 @@ public:
return Ty->convertValue(const_cast<VarInit *>(this));
}
const std::string &getName() const { return VarName; }
const std::string &getName() const;
Init *getNameInit() const { return VarName; }
std::string getNameInitAsString() const {
return getNameInit()->getAsUnquotedString();
}
virtual Init *resolveBitReference(Record &R, const RecordVal *RV,
unsigned Bit) const;
@ -1092,7 +1098,7 @@ public:
///
virtual Init *resolveReferences(Record &R, const RecordVal *RV) const;
virtual std::string getAsString() const { return VarName; }
virtual std::string getAsString() const { return getName(); }
};

14
llvm/lib/TableGen/Record.cpp
View File

@ -1298,7 +1298,12 @@ TypedInit::convertInitListSlice(const std::vector<unsigned> &Elements) const {
VarInit *VarInit::get(const std::string &VN, RecTy *T) {
typedef std::pair<RecTy *, TableGenStringKey> Key;
Init *Value = StringInit::get(VN);
return VarInit::get(Value, T);
}
VarInit *VarInit::get(Init *VN, RecTy *T) {
typedef std::pair<RecTy *, Init *> Key;
typedef DenseMap<Key, VarInit *> Pool;
static Pool ThePool;
@ -1309,6 +1314,13 @@ VarInit *VarInit::get(const std::string &VN, RecTy *T) {
return I;
}
const std::string &VarInit::getName() const {
StringInit *NameString =
dynamic_cast<StringInit *>(getNameInit());
assert(NameString && "VarInit name is not a string!");
return NameString->getValue();
}
Init *VarInit::resolveBitReference(Record &R, const RecordVal *IRV,
unsigned Bit) const {
if (R.isTemplateArg(getName())) return 0;