Index: include/llvm/TableGen/Record.h
===================================================================
--- include/llvm/TableGen/Record.h
+++ include/llvm/TableGen/Record.h
@@ -419,12 +419,6 @@
/// they are of record type.
///
RecTy *getFieldType(StringInit *FieldName) const override;
-
- /// This method is used to implement
- /// VarListElementInit::resolveReferences. If the list element is resolvable
- /// now, we return the resolved value, otherwise we return null.
- virtual Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const = 0;
};
/// '?' - Represents an uninitialized value
@@ -471,11 +465,6 @@
Init *convertInitializerTo(RecTy *Ty) const override;
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override {
- llvm_unreachable("Illegal element reference off bit");
- }
-
Init *getBit(unsigned Bit) const override {
assert(Bit < 1 && "Bit index out of range!");
return const_cast<BitInit*>(this);
@@ -527,14 +516,6 @@
std::string getAsString() const override;
- /// This method is used to implement
- /// VarListElementInit::resolveReferences. If the list element is resolvable
- /// now, we return the resolved value, otherwise we return null.
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override {
- llvm_unreachable("Illegal element reference off bits<n>");
- }
-
Init *resolveReferences(Record &R, const RecordVal *RV) const override;
Init *getBit(unsigned Bit) const override {
@@ -567,14 +548,6 @@
std::string getAsString() const override;
- /// This method is used to implement
- /// VarListElementInit::resolveReferences. If the list element is resolvable
- /// now, we return the resolved value, otherwise we return null.
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override {
- llvm_unreachable("Illegal element reference off int");
- }
-
Init *getBit(unsigned Bit) const override {
return BitInit::get((Value & (1ULL << Bit)) != 0);
}
@@ -605,14 +578,6 @@
std::string getAsUnquotedString() const override { return Value; }
- /// resolveListElementReference - This method is used to implement
- /// VarListElementInit::resolveReferences. If the list element is resolvable
- /// now, we return the resolved value, otherwise we return null.
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override {
- llvm_unreachable("Illegal element reference off string");
- }
-
Init *getBit(unsigned Bit) const override {
llvm_unreachable("Illegal bit reference off string");
}
@@ -645,14 +610,6 @@
std::string getAsUnquotedString() const override { return Value; }
- /// This method is used to implement
- /// VarListElementInit::resolveReferences. If the list element is resolvable
- /// now, we return the resolved value, otherwise we return null.
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override {
- llvm_unreachable("Illegal element reference off string");
- }
-
Init *getBit(unsigned Bit) const override {
llvm_unreachable("Illegal bit reference off string");
}
@@ -718,12 +675,6 @@
size_t size () const { return NumValues; }
bool empty() const { return NumValues == 0; }
- /// This method is used to implement
- /// VarListElementInit::resolveReferences. If the list element is resolvable
- /// now, we return the resolved value, otherwise we return null.
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override;
-
Init *getBit(unsigned Bit) const override {
llvm_unreachable("Illegal bit reference off list");
}
@@ -755,9 +706,6 @@
// possible to fold.
virtual Init *Fold(Record *CurRec, MultiClass *CurMultiClass) const = 0;
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override;
-
Init *getBit(unsigned Bit) const override;
};
@@ -952,9 +900,6 @@
return getNameInit()->getAsUnquotedString();
}
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override;
-
RecTy *getFieldType(StringInit *FieldName) const override;
Init *getFieldInit(Record &R, const RecordVal *RV,
StringInit *FieldName) const override;
@@ -1003,11 +948,6 @@
std::string getAsString() const override;
Init *resolveReferences(Record &R, const RecordVal *RV) const override;
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override {
- llvm_unreachable("Illegal element reference off bit");
- }
-
Init *getBit(unsigned B) const override {
assert(B < 1 && "Bit index out of range!");
return const_cast<VarBitInit*>(this);
@@ -1041,12 +981,6 @@
TypedInit *getVariable() const { return TI; }
unsigned getElementNum() const { return Element; }
- /// This method is used to implement
- /// VarListElementInit::resolveReferences. If the list element is resolvable
- /// now, we return the resolved value, otherwise we return null.
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override;
-
std::string getAsString() const override;
Init *resolveReferences(Record &R, const RecordVal *RV) const override;
@@ -1086,14 +1020,6 @@
Init *getBit(unsigned Bit) const override {
llvm_unreachable("Illegal bit reference off def");
}
-
- /// This method is used to implement
- /// VarListElementInit::resolveReferences. If the list element is resolvable
- /// now, we return the resolved value, otherwise we return null.
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override {
- llvm_unreachable("Illegal element reference off def");
- }
};
/// X.Y - Represent a reference to a subfield of a variable
@@ -1118,9 +1044,6 @@
Init *getBit(unsigned Bit) const override;
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override;
-
Init *resolveReferences(Record &R, const RecordVal *RV) const override;
std::string getAsString() const override {
@@ -1218,11 +1141,6 @@
Init *getBit(unsigned Bit) const override {
llvm_unreachable("Illegal bit reference off dag");
}
-
- Init *resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const override {
- llvm_unreachable("Illegal element reference off dag");
- }
};
//===----------------------------------------------------------------------===//
Index: lib/TableGen/Record.cpp
===================================================================
--- lib/TableGen/Record.cpp
+++ lib/TableGen/Record.cpp
@@ -570,19 +570,6 @@
return const_cast<ListInit *>(this);
}
-Init *ListInit::resolveListElementReference(Record &R, const RecordVal *IRV,
- unsigned Elt) const {
- if (Elt >= size())
- return nullptr; // Out of range reference.
- Init *E = getElement(Elt);
- // If the element is set to some value, or if we are resolving a reference
- // to a specific variable and that variable is explicitly unset, then
- // replace the VarListElementInit with it.
- if (IRV || !isa<UnsetInit>(E))
- return E;
- return nullptr;
-}
-
std::string ListInit::getAsString() const {
std::string Result = "[";
const char *sep = "";
@@ -594,24 +581,6 @@
return Result + "]";
}
-Init *OpInit::resolveListElementReference(Record &R, const RecordVal *IRV,
- unsigned Elt) const {
- Init *Resolved = resolveReferences(R, IRV);
- OpInit *OResolved = dyn_cast<OpInit>(Resolved);
- if (OResolved) {
- Resolved = OResolved->Fold(&R, nullptr);
- }
-
- if (Resolved != this) {
- TypedInit *Typed = cast<TypedInit>(Resolved);
- if (Init *New = Typed->resolveListElementReference(R, IRV, Elt))
- return New;
- return VarListElementInit::get(Typed, Elt);
- }
-
- return nullptr;
-}
-
Init *OpInit::getBit(unsigned Bit) const {
if (getType() == BitRecTy::get())
return const_cast<OpInit*>(this);
@@ -1285,29 +1254,6 @@
return VarBitInit::get(const_cast<VarInit*>(this), Bit);
}
-Init *VarInit::resolveListElementReference(Record &R,
- const RecordVal *IRV,
- unsigned Elt) const {
- if (R.isTemplateArg(getNameInit())) return nullptr;
- if (IRV && IRV->getNameInit() != getNameInit()) return nullptr;
-
- RecordVal *RV = R.getValue(getNameInit());
- assert(RV && "Reference to a non-existent variable?");
- ListInit *LI = dyn_cast<ListInit>(RV->getValue());
- if (!LI)
- return VarListElementInit::get(cast<TypedInit>(RV->getValue()), Elt);
-
- if (Elt >= LI->size())
- return nullptr; // Out of range reference.
- Init *E = LI->getElement(Elt);
- // If the element is set to some value, or if we are resolving a reference
- // to a specific variable and that variable is explicitly unset, then
- // replace the VarListElementInit with it.
- if (IRV || !isa<UnsetInit>(E))
- return E;
- return nullptr;
-}
-
RecTy *VarInit::getFieldType(StringInit *FieldName) const {
if (RecordRecTy *RTy = dyn_cast<RecordRecTy>(getType()))
if (const RecordVal *RV = RTy->getRecord()->getValue(FieldName))
@@ -1386,9 +1332,15 @@
Init *
VarListElementInit::resolveReferences(Record &R, const RecordVal *RV) const {
- if (Init *I = getVariable()->resolveListElementReference(R, RV,
- getElementNum()))
- return I;
+ Init *NewTI = TI->resolveReferences(R, RV);
+ if (ListInit *List = dyn_cast<ListInit>(NewTI)) {
+ // Leave out-of-bounds array references as-is. This can happen without
+ // being an error, e.g. in the untaken "branch" of an !if expression.
+ if (getElementNum() < List->size())
+ return List->getElement(getElementNum());
+ }
+ if (NewTI != TI && isa<TypedInit>(NewTI))
+ return VarListElementInit::get(cast<TypedInit>(NewTI), getElementNum());
return const_cast<VarListElementInit *>(this);
}
@@ -1398,21 +1350,6 @@
return VarBitInit::get(const_cast<VarListElementInit*>(this), Bit);
}
-Init *VarListElementInit:: resolveListElementReference(Record &R,
- const RecordVal *RV,
- unsigned Elt) const {
- if (Init *Result = TI->resolveListElementReference(R, RV, Element)) {
- if (TypedInit *TInit = dyn_cast<TypedInit>(Result)) {
- if (Init *Result2 = TInit->resolveListElementReference(R, RV, Elt))
- return Result2;
- return VarListElementInit::get(TInit, Elt);
- }
- return Result;
- }
-
- return nullptr;
-}
-
DefInit *DefInit::get(Record *R) {
return R->getDefInit();
}
@@ -1456,22 +1393,6 @@
return VarBitInit::get(const_cast<FieldInit*>(this), Bit);
}
-Init *FieldInit::resolveListElementReference(Record &R, const RecordVal *RV,
- unsigned Elt) const {
- if (Init *ListVal = Rec->getFieldInit(R, RV, FieldName))
- if (ListInit *LI = dyn_cast<ListInit>(ListVal)) {
- if (Elt >= LI->size()) return nullptr;
- Init *E = LI->getElement(Elt);
-
- // If the element is set to some value, or if we are resolving a
- // reference to a specific variable and that variable is explicitly
- // unset, then replace the VarListElementInit with it.
- if (RV || !isa<UnsetInit>(E))
- return E;
- }
- return nullptr;
-}
-
Init *FieldInit::resolveReferences(Record &R, const RecordVal *RV) const {
Init *NewRec = RV ? Rec->resolveReferences(R, RV) : Rec;