ListRecTy *RecTy::getListTy() {
if (!ListTy)
- ListTy = new ListRecTy(this);
- return ListTy;
+ ListTy.reset(new ListRecTy(this));
+ return ListTy.get();
}
-bool RecTy::baseClassOf(const RecTy *RHS) const{
+bool RecTy::baseClassOf(const RecTy *RHS) const {
assert (RHS && "NULL pointer");
return Kind == RHS->getRecTyKind();
}
return BitInit::get(Val != 0);
}
-Init *BitRecTy::convertValue(TypedInit *VI) {
- RecTy *Ty = VI->getType();
- if (isa<BitRecTy>(Ty) || isa<BitsRecTy>(Ty) || isa<IntRecTy>(Ty))
- return VI; // Accept variable if it is already of bit type!
+Init *BitRecTy::convertValue(TypedInit *TI) {
+ RecTy *Ty = TI->getType();
+ if (isa<BitRecTy>(Ty))
+ return TI; // Accept variable if it is already of bit type!
+ if (auto *BitsTy = dyn_cast<BitsRecTy>(Ty))
+ // Accept only bits<1> expression.
+ return BitsTy->getNumBits() == 1 ? TI : nullptr;
+ // Ternary !if can be converted to bit, but only if both sides are
+ // convertible to a bit.
+ if (TernOpInit *TOI = dyn_cast<TernOpInit>(TI)) {
+ if (TOI->getOpcode() != TernOpInit::TernaryOp::IF)
+ return nullptr;
+ if (!TOI->getMHS()->convertInitializerTo(BitRecTy::get()) ||
+ !TOI->getRHS()->convertInitializerTo(BitRecTy::get()))
+ return nullptr;
+ return TOI;
+ }
return nullptr;
}
bool BitRecTy::baseClassOf(const RecTy *RHS) const{
- if(RecTy::baseClassOf(RHS) || getRecTyKind() == IntRecTyKind)
+ if(RecTy::baseClassOf(RHS) || RHS->getRecTyKind() == IntRecTyKind)
return true;
if(const BitsRecTy *BitsTy = dyn_cast<BitsRecTy>(RHS))
return BitsTy->getNumBits() == 1;
}
BitsRecTy *BitsRecTy::get(unsigned Sz) {
- static std::vector<BitsRecTy*> Shared;
+ static std::vector<std::unique_ptr<BitsRecTy>> Shared;
if (Sz >= Shared.size())
Shared.resize(Sz + 1);
- BitsRecTy *&Ty = Shared[Sz];
+ std::unique_ptr<BitsRecTy> &Ty = Shared[Sz];
if (!Ty)
- Ty = new BitsRecTy(Sz);
- return Ty;
+ Ty.reset(new BitsRecTy(Sz));
+ return Ty.get();
}
std::string BitsRecTy::getAsString() const {
return BitsInit::get(NewBits);
}
-Init *BitsRecTy::convertValue(BitInit *UI) {
+Init *BitsRecTy::convertValue(BitInit *BI) {
if (Size != 1) return nullptr; // Can only convert single bit.
- return BitsInit::get(UI);
+ return BitsInit::get(BI);
}
/// canFitInBitfield - Return true if the number of bits is large enough to hold
return nullptr;
}
-Init *BitsRecTy::convertValue(TypedInit *VI) {
- if (Size == 1 && isa<BitRecTy>(VI->getType()))
- return BitsInit::get(VI);
+Init *BitsRecTy::convertValue(TypedInit *TI) {
+ if (Size == 1 && isa<BitRecTy>(TI->getType()))
+ return BitsInit::get(TI);
- if (VI->getType()->typeIsConvertibleTo(this)) {
+ if (TI->getType()->typeIsConvertibleTo(this)) {
SmallVector<Init *, 16> NewBits(Size);
for (unsigned i = 0; i != Size; ++i)
- NewBits[i] = VarBitInit::get(VI, i);
+ NewBits[i] = VarBitInit::get(TI, i);
return BitsInit::get(NewBits);
}
Init *IntRecTy::convertValue(BitsInit *BI) {
int64_t Result = 0;
for (unsigned i = 0, e = BI->getNumBits(); i != e; ++i)
- if (BitInit *Bit = dyn_cast<BitInit>(BI->getBit(i))) {
- Result |= Bit->getValue() << i;
- } else {
+ if (BitInit *Bit = dyn_cast<BitInit>(BI->getBit(i)))
+ Result |= static_cast<int64_t>(Bit->getValue()) << i;
+ else
return nullptr;
- }
return IntInit::get(Result);
}
return kind==BitRecTyKind || kind==BitsRecTyKind || kind==IntRecTyKind;
}
-Init *StringRecTy::convertValue(UnOpInit *BO) {
- if (BO->getOpcode() == UnOpInit::CAST) {
- Init *L = BO->getOperand()->convertInitializerTo(this);
+Init *StringRecTy::convertValue(UnOpInit *UO) {
+ if (UO->getOpcode() == UnOpInit::CAST) {
+ Init *L = UO->getOperand()->convertInitializerTo(this);
if (!L) return nullptr;
- if (L != BO->getOperand())
- return UnOpInit::get(UnOpInit::CAST, L, new StringRecTy);
- return BO;
+ if (L != UO->getOperand())
+ return UnOpInit::get(UnOpInit::CAST, L, StringRecTy::get());
+ return UO;
}
- return convertValue((TypedInit*)BO);
+ return convertValue((TypedInit*)UO);
}
Init *StringRecTy::convertValue(BinOpInit *BO) {
Init *R = BO->getRHS()->convertInitializerTo(this);
if (!L || !R) return nullptr;
if (L != BO->getLHS() || R != BO->getRHS())
- return BinOpInit::get(BinOpInit::STRCONCAT, L, R, new StringRecTy);
+ return BinOpInit::get(BinOpInit::STRCONCAT, L, R, StringRecTy::get());
return BO;
}
return nullptr;
}
-Init *DagRecTy::convertValue(UnOpInit *BO) {
- if (BO->getOpcode() == UnOpInit::CAST) {
- Init *L = BO->getOperand()->convertInitializerTo(this);
+Init *DagRecTy::convertValue(UnOpInit *UO) {
+ if (UO->getOpcode() == UnOpInit::CAST) {
+ Init *L = UO->getOperand()->convertInitializerTo(this);
if (!L) return nullptr;
- if (L != BO->getOperand())
- return UnOpInit::get(UnOpInit::CAST, L, new DagRecTy);
- return BO;
+ if (L != UO->getOperand())
+ return UnOpInit::get(UnOpInit::CAST, L, DagRecTy::get());
+ return UO;
}
return nullptr;
}
Init *R = BO->getRHS()->convertInitializerTo(this);
if (!L || !R) return nullptr;
if (L != BO->getLHS() || R != BO->getRHS())
- return BinOpInit::get(BinOpInit::CONCAT, L, R, new DagRecTy);
+ return BinOpInit::get(BinOpInit::CONCAT, L, R, DagRecTy::get());
return BO;
}
return nullptr;
}
/// resolveTypes - Find a common type that T1 and T2 convert to.
-/// Return 0 if no such type exists.
+/// Return null if no such type exists.
///
RecTy *llvm::resolveTypes(RecTy *T1, RecTy *T2) {
if (T1->typeIsConvertibleTo(T2))
// If one is a Record type, check superclasses
if (RecordRecTy *RecTy1 = dyn_cast<RecordRecTy>(T1)) {
// See if T2 inherits from a type T1 also inherits from
- const std::vector<Record *> &T1SuperClasses =
- RecTy1->getRecord()->getSuperClasses();
- for(std::vector<Record *>::const_iterator i = T1SuperClasses.begin(),
- iend = T1SuperClasses.end();
- i != iend;
- ++i) {
- RecordRecTy *SuperRecTy1 = RecordRecTy::get(*i);
+ for (Record *SuperRec1 : RecTy1->getRecord()->getSuperClasses()) {
+ RecordRecTy *SuperRecTy1 = RecordRecTy::get(SuperRec1);
RecTy *NewType1 = resolveTypes(SuperRecTy1, T2);
- if (NewType1) {
- if (NewType1 != SuperRecTy1) {
- delete SuperRecTy1;
- }
+ if (NewType1)
return NewType1;
- }
}
}
if (RecordRecTy *RecTy2 = dyn_cast<RecordRecTy>(T2)) {
// See if T1 inherits from a type T2 also inherits from
- const std::vector<Record *> &T2SuperClasses =
- RecTy2->getRecord()->getSuperClasses();
- for (std::vector<Record *>::const_iterator i = T2SuperClasses.begin(),
- iend = T2SuperClasses.end();
- i != iend;
- ++i) {
- RecordRecTy *SuperRecTy2 = RecordRecTy::get(*i);
+ for (Record *SuperRec2 : RecTy2->getRecord()->getSuperClasses()) {
+ RecordRecTy *SuperRecTy2 = RecordRecTy::get(SuperRec2);
RecTy *NewType2 = resolveTypes(T1, SuperRecTy2);
- if (NewType2) {
- if (NewType2 != SuperRecTy2) {
- delete SuperRecTy2;
- }
+ if (NewType2)
return NewType2;
- }
}
}
return nullptr;
ProfileBitsInit(FoldingSetNodeID &ID, ArrayRef<Init *> Range) {
ID.AddInteger(Range.size());
- for (ArrayRef<Init *>::iterator i = Range.begin(),
- iend = Range.end();
- i != iend;
- ++i)
- ID.AddPointer(*i);
+ for (Init *I : Range)
+ ID.AddPointer(I);
}
BitsInit *BitsInit::get(ArrayRef<Init *> Range) {
- typedef FoldingSet<BitsInit> Pool;
- static Pool ThePool;
+ static FoldingSet<BitsInit> ThePool;
+ static std::vector<std::unique_ptr<BitsInit>> TheActualPool;
FoldingSetNodeID ID;
ProfileBitsInit(ID, Range);
BitsInit *I = new BitsInit(Range);
ThePool.InsertNode(I, IP);
-
+ TheActualPool.push_back(std::unique_ptr<BitsInit>(I));
return I;
}
// bits initializer will resolve into VarBitInit to keep the field name and bit
// number used in targets with fixed insn length.
static Init *fixBitInit(const RecordVal *RV, Init *Before, Init *After) {
- if (RV || After != UnsetInit::get())
+ if (RV || !isa<UnsetInit>(After))
return After;
return Before;
}
return const_cast<BitsInit *>(this);
}
-namespace {
- template<typename T>
- class Pool : public T {
- public:
- ~Pool();
- };
- template<typename T>
- Pool<T>::~Pool() {
- for (typename T::iterator I = this->begin(), E = this->end(); I != E; ++I) {
- typename T::value_type &Item = *I;
- delete Item.second;
- }
- }
-}
-
IntInit *IntInit::get(int64_t V) {
- static Pool<DenseMap<int64_t, IntInit *> > ThePool;
+ static DenseMap<int64_t, std::unique_ptr<IntInit>> ThePool;
- IntInit *&I = ThePool[V];
- if (!I) I = new IntInit(V);
- return I;
+ std::unique_ptr<IntInit> &I = ThePool[V];
+ if (!I) I.reset(new IntInit(V));
+ return I.get();
}
std::string IntInit::getAsString() const {
void StringInit::anchor() { }
StringInit *StringInit::get(StringRef V) {
- static Pool<StringMap<StringInit *> > ThePool;
+ static StringMap<std::unique_ptr<StringInit>> ThePool;
- StringInit *&I = ThePool[V];
- if (!I) I = new StringInit(V);
- return I;
+ std::unique_ptr<StringInit> &I = ThePool[V];
+ if (!I) I.reset(new StringInit(V));
+ return I.get();
}
static void ProfileListInit(FoldingSetNodeID &ID,
ID.AddInteger(Range.size());
ID.AddPointer(EltTy);
- for (ArrayRef<Init *>::iterator i = Range.begin(),
- iend = Range.end();
- i != iend;
- ++i)
- ID.AddPointer(*i);
+ for (Init *I : Range)
+ ID.AddPointer(I);
}
ListInit *ListInit::get(ArrayRef<Init *> Range, RecTy *EltTy) {
- typedef FoldingSet<ListInit> Pool;
- static Pool ThePool;
+ static FoldingSet<ListInit> ThePool;
static std::vector<std::unique_ptr<ListInit>> TheActualPool;
FoldingSetNodeID ID;
}
void ListInit::Profile(FoldingSetNodeID &ID) const {
- ListRecTy *ListType = dyn_cast<ListRecTy>(getType());
- assert(ListType && "Bad type for ListInit!");
- RecTy *EltTy = ListType->getElementType();
+ RecTy *EltTy = cast<ListRecTy>(getType())->getElementType();
ProfileListInit(ID, Values, EltTy);
}
}
if (Resolved != this) {
- TypedInit *Typed = dyn_cast<TypedInit>(Resolved);
- assert(Typed && "Expected typed init for list reference");
- if (Typed) {
- Init *New = Typed->resolveListElementReference(R, IRV, Elt);
- if (New)
- return New;
- return VarListElementInit::get(Typed, Elt);
- }
+ TypedInit *Typed = cast<TypedInit>(Resolved);
+ if (Init *New = Typed->resolveListElementReference(R, IRV, Elt))
+ return New;
+ return VarListElementInit::get(Typed, Elt);
}
return nullptr;
UnOpInit *UnOpInit::get(UnaryOp opc, Init *lhs, RecTy *Type) {
typedef std::pair<std::pair<unsigned, Init *>, RecTy *> Key;
- static Pool<DenseMap<Key, UnOpInit *> > ThePool;
+ static DenseMap<Key, std::unique_ptr<UnOpInit>> ThePool;
Key TheKey(std::make_pair(std::make_pair(opc, lhs), Type));
- UnOpInit *&I = ThePool[TheKey];
- if (!I) I = new UnOpInit(opc, lhs, Type);
- return I;
+ std::unique_ptr<UnOpInit> &I = ThePool[TheKey];
+ if (!I) I.reset(new UnOpInit(opc, lhs, Type));
+ return I.get();
}
Init *UnOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) const {
Init *TemplateArgName = QualifyName(*CurRec, CurMultiClass, Name,
":");
-
+
if (CurRec->isTemplateArg(TemplateArgName)) {
const RecordVal *RV = CurRec->getValue(TemplateArgName);
assert(RV && "Template arg doesn't exist??");
}
if (CurMultiClass) {
- Init *MCName = QualifyName(CurMultiClass->Rec, CurMultiClass, Name, "::");
+ Init *MCName = QualifyName(CurMultiClass->Rec, CurMultiClass, Name,
+ "::");
if (CurMultiClass->Rec.isTemplateArg(MCName)) {
const RecordVal *RV = CurMultiClass->Rec.getValue(MCName);
return VarInit::get(MCName, RV->getType());
}
}
-
+ assert(CurRec && "NULL pointer");
if (Record *D = (CurRec->getRecords()).getDef(Name))
return DefInit::get(D);
}
case HEAD: {
if (ListInit *LHSl = dyn_cast<ListInit>(LHS)) {
- assert(LHSl->getSize() != 0 && "Empty list in car");
+ assert(!LHSl->empty() && "Empty list in head");
return LHSl->getElement(0);
}
break;
}
case TAIL: {
if (ListInit *LHSl = dyn_cast<ListInit>(LHS)) {
- assert(LHSl->getSize() != 0 && "Empty list in cdr");
+ assert(!LHSl->empty() && "Empty list in tail");
// Note the +1. We can't just pass the result of getValues()
// directly.
- ArrayRef<Init *>::iterator begin = LHSl->getValues().begin()+1;
- ArrayRef<Init *>::iterator end = LHSl->getValues().end();
- ListInit *Result =
- ListInit::get(ArrayRef<Init *>(begin, end - begin),
- LHSl->getType());
- return Result;
+ return ListInit::get(LHSl->getValues().slice(1), LHSl->getType());
}
break;
}
case EMPTY: {
- if (ListInit *LHSl = dyn_cast<ListInit>(LHS)) {
- if (LHSl->getSize() == 0) {
- return IntInit::get(1);
- } else {
- return IntInit::get(0);
- }
- }
- if (StringInit *LHSs = dyn_cast<StringInit>(LHS)) {
- if (LHSs->getValue().empty()) {
- return IntInit::get(1);
- } else {
- return IntInit::get(0);
- }
- }
+ if (ListInit *LHSl = dyn_cast<ListInit>(LHS))
+ return IntInit::get(LHSl->empty());
+ if (StringInit *LHSs = dyn_cast<StringInit>(LHS))
+ return IntInit::get(LHSs->getValue().empty());
break;
}
RecTy *
> Key;
- static Pool<DenseMap<Key, BinOpInit *> > ThePool;
+ static DenseMap<Key, std::unique_ptr<BinOpInit>> ThePool;
Key TheKey(std::make_pair(std::make_pair(std::make_pair(opc, lhs), rhs),
Type));
- BinOpInit *&I = ThePool[TheKey];
- if (!I) I = new BinOpInit(opc, lhs, rhs, Type);
- return I;
+ std::unique_ptr<BinOpInit> &I = ThePool[TheKey];
+ if (!I) I.reset(new BinOpInit(opc, lhs, rhs, Type));
+ return I.get();
}
Init *BinOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) const {
Args.insert(Args.end(), LHSs->begin(), LHSs->end());
Args.insert(Args.end(), RHSs->begin(), RHSs->end());
return ListInit::get(
- Args, static_cast<ListRecTy *>(LHSs->getType())->getElementType());
+ Args, cast<ListRecTy>(LHSs->getType())->getElementType());
}
break;
}
break;
}
case ADD:
+ case AND:
case SHL:
case SRA:
case SRL: {
switch (getOpcode()) {
default: llvm_unreachable("Bad opcode!");
case ADD: Result = LHSv + RHSv; break;
+ case AND: Result = LHSv & RHSv; break;
case SHL: Result = LHSv << RHSv; break;
case SRA: Result = LHSv >> RHSv; break;
case SRL: Result = (uint64_t)LHSv >> (uint64_t)RHSv; break;
switch (Opc) {
case CONCAT: Result = "!con"; break;
case ADD: Result = "!add"; break;
+ case AND: Result = "!and"; break;
case SHL: Result = "!shl"; break;
case SRA: Result = "!sra"; break;
case SRL: Result = "!srl"; break;
return Result + "(" + LHS->getAsString() + ", " + RHS->getAsString() + ")";
}
-TernOpInit *TernOpInit::get(TernaryOp opc, Init *lhs,
- Init *mhs, Init *rhs,
- RecTy *Type) {
+TernOpInit *TernOpInit::get(TernaryOp opc, Init *lhs, Init *mhs, Init *rhs,
+ RecTy *Type) {
typedef std::pair<
std::pair<
std::pair<std::pair<unsigned, RecTy *>, Init *>,
Init *
> Key;
- typedef DenseMap<Key, TernOpInit *> Pool;
- static Pool ThePool;
+ static DenseMap<Key, std::unique_ptr<TernOpInit>> ThePool;
Key TheKey(std::make_pair(std::make_pair(std::make_pair(std::make_pair(opc,
Type),
mhs),
rhs));
- TernOpInit *&I = ThePool[TheKey];
- if (!I) I = new TernOpInit(opc, lhs, mhs, rhs, Type);
- return I;
+ std::unique_ptr<TernOpInit> &I = ThePool[TheKey];
+ if (!I) I.reset(new TernOpInit(opc, lhs, mhs, rhs, Type));
+ return I.get();
}
static Init *ForeachHelper(Init *LHS, Init *MHS, Init *RHS, RecTy *Type,
static Init *EvaluateOperation(OpInit *RHSo, Init *LHS, Init *Arg,
RecTy *Type, Record *CurRec,
MultiClass *CurMultiClass) {
- std::vector<Init *> NewOperands;
-
- TypedInit *TArg = dyn_cast<TypedInit>(Arg);
-
// If this is a dag, recurse
- if (TArg && TArg->getType()->getAsString() == "dag") {
- Init *Result = ForeachHelper(LHS, Arg, RHSo, Type,
- CurRec, CurMultiClass);
- return Result;
- }
+ if (auto *TArg = dyn_cast<TypedInit>(Arg))
+ if (TArg->getType()->getAsString() == "dag")
+ return ForeachHelper(LHS, Arg, RHSo, Type, CurRec, CurMultiClass);
+ std::vector<Init *> NewOperands;
for (int i = 0; i < RHSo->getNumOperands(); ++i) {
- OpInit *RHSoo = dyn_cast<OpInit>(RHSo->getOperand(i));
-
- if (RHSoo) {
- Init *Result = EvaluateOperation(RHSoo, LHS, Arg,
- Type, CurRec, CurMultiClass);
- if (Result) {
+ if (auto *RHSoo = dyn_cast<OpInit>(RHSo->getOperand(i))) {
+ if (Init *Result = EvaluateOperation(RHSoo, LHS, Arg,
+ Type, CurRec, CurMultiClass))
NewOperands.push_back(Result);
- } else {
+ else
NewOperands.push_back(Arg);
- }
} else if (LHS->getAsString() == RHSo->getOperand(i)->getAsString()) {
NewOperands.push_back(Arg);
} else {
OpInit *RHSo = dyn_cast<OpInit>(RHS);
- if (!RHSo) {
+ if (!RHSo)
PrintFatalError(CurRec->getLoc(), "!foreach requires an operator\n");
- }
TypedInit *LHSt = dyn_cast<TypedInit>(LHS);
Init *Val = MHSd->getOperator();
Init *Result = EvaluateOperation(RHSo, LHS, Val,
Type, CurRec, CurMultiClass);
- if (Result) {
+ if (Result)
Val = Result;
- }
std::vector<std::pair<Init *, std::string> > args;
for (unsigned int i = 0; i < MHSd->getNumArgs(); ++i) {
// Process args
Init *Result = EvaluateOperation(RHSo, LHS, Arg, Type,
CurRec, CurMultiClass);
- if (Result) {
+ if (Result)
Arg = Result;
- }
// TODO: Process arg names
args.push_back(std::make_pair(Arg, ArgName));
std::vector<Init *> NewOperands;
std::vector<Init *> NewList(MHSl->begin(), MHSl->end());
- for (std::vector<Init *>::iterator li = NewList.begin(),
- liend = NewList.end();
- li != liend;
- ++li) {
- Init *Item = *li;
+ for (Init *&Item : NewList) {
NewOperands.clear();
for(int i = 0; i < RHSo->getNumOperands(); ++i) {
// First, replace the foreach variable with the list item
- if (LHS->getAsString() == RHSo->getOperand(i)->getAsString()) {
+ if (LHS->getAsString() == RHSo->getOperand(i)->getAsString())
NewOperands.push_back(Item);
- } else {
+ else
NewOperands.push_back(RHSo->getOperand(i));
- }
}
// Now run the operator and use its result as the new list item
const OpInit *NewOp = RHSo->clone(NewOperands);
Init *NewItem = NewOp->Fold(CurRec, CurMultiClass);
if (NewItem != NewOp)
- *li = NewItem;
+ Item = NewItem;
}
return ListInit::get(NewList, MHSl->getType());
}
VarInit *RHSv = dyn_cast<VarInit>(RHS);
StringInit *RHSs = dyn_cast<StringInit>(RHS);
- if ((LHSd && MHSd && RHSd)
- || (LHSv && MHSv && RHSv)
- || (LHSs && MHSs && RHSs)) {
- if (RHSd) {
- Record *Val = RHSd->getDef();
- if (LHSd->getAsString() == RHSd->getAsString()) {
- Val = MHSd->getDef();
- }
- return DefInit::get(Val);
- }
- if (RHSv) {
- std::string Val = RHSv->getName();
- if (LHSv->getAsString() == RHSv->getAsString()) {
- Val = MHSv->getName();
- }
- return VarInit::get(Val, getType());
+ if (LHSd && MHSd && RHSd) {
+ Record *Val = RHSd->getDef();
+ if (LHSd->getAsString() == RHSd->getAsString())
+ Val = MHSd->getDef();
+ return DefInit::get(Val);
+ }
+ if (LHSv && MHSv && RHSv) {
+ std::string Val = RHSv->getName();
+ if (LHSv->getAsString() == RHSv->getAsString())
+ Val = MHSv->getName();
+ return VarInit::get(Val, getType());
+ }
+ if (LHSs && MHSs && RHSs) {
+ std::string Val = RHSs->getValue();
+
+ std::string::size_type found;
+ std::string::size_type idx = 0;
+ while (true) {
+ found = Val.find(LHSs->getValue(), idx);
+ if (found == std::string::npos)
+ break;
+ Val.replace(found, LHSs->getValue().size(), MHSs->getValue());
+ idx = found + MHSs->getValue().size();
}
- if (RHSs) {
- std::string Val = RHSs->getValue();
-
- std::string::size_type found;
- std::string::size_type idx = 0;
- do {
- found = Val.find(LHSs->getValue(), idx);
- if (found != std::string::npos) {
- Val.replace(found, LHSs->getValue().size(), MHSs->getValue());
- }
- idx = found + MHSs->getValue().size();
- } while (found != std::string::npos);
- return StringInit::get(Val);
- }
+ return StringInit::get(Val);
}
break;
}
case FOREACH: {
- Init *Result = ForeachHelper(LHS, MHS, RHS, getType(),
- CurRec, CurMultiClass);
- if (Result) {
+ if (Init *Result = ForeachHelper(LHS, MHS, RHS, getType(),
+ CurRec, CurMultiClass))
return Result;
- }
break;
}
if (Init *I = LHS->convertInitializerTo(IntRecTy::get()))
LHSi = dyn_cast<IntInit>(I);
if (LHSi) {
- if (LHSi->getValue()) {
+ if (LHSi->getValue())
return MHS;
- } else {
- return RHS;
- }
+ return RHS;
}
break;
}
Init *mhs = MHS->resolveReferences(R, RV);
return (TernOpInit::get(getOpcode(), lhs, mhs,
RHS, getType()))->Fold(&R, nullptr);
- } else {
- Init *rhs = RHS->resolveReferences(R, RV);
- return (TernOpInit::get(getOpcode(), lhs, MHS,
- rhs, getType()))->Fold(&R, nullptr);
}
+ Init *rhs = RHS->resolveReferences(R, RV);
+ return (TernOpInit::get(getOpcode(), lhs, MHS,
+ rhs, getType()))->Fold(&R, nullptr);
}
}
case SUBST: Result = "!subst"; break;
case FOREACH: Result = "!foreach"; break;
case IF: Result = "!if"; break;
- }
- return Result + "(" + LHS->getAsString() + ", " + MHS->getAsString() + ", "
- + RHS->getAsString() + ")";
+ }
+ return Result + "(" + LHS->getAsString() + ", " + MHS->getAsString() + ", " +
+ RHS->getAsString() + ")";
}
RecTy *TypedInit::getFieldType(const std::string &FieldName) const {
VarInit *VarInit::get(Init *VN, RecTy *T) {
typedef std::pair<RecTy *, Init *> Key;
- static Pool<DenseMap<Key, VarInit *> > ThePool;
+ static DenseMap<Key, std::unique_ptr<VarInit>> ThePool;
Key TheKey(std::make_pair(T, VN));
- VarInit *&I = ThePool[TheKey];
- if (!I) I = new VarInit(VN, T);
- return I;
+ std::unique_ptr<VarInit> &I = ThePool[TheKey];
+ if (!I) I.reset(new VarInit(VN, T));
+ return I.get();
}
const std::string &VarInit::getName() const {
- StringInit *NameString = dyn_cast<StringInit>(getNameInit());
- assert(NameString && "VarInit name is not a string!");
+ StringInit *NameString = cast<StringInit>(getNameInit());
return NameString->getValue();
}
RecordVal *RV = R.getValue(getNameInit());
assert(RV && "Reference to a non-existent variable?");
ListInit *LI = dyn_cast<ListInit>(RV->getValue());
- if (!LI) {
- TypedInit *VI = dyn_cast<TypedInit>(RV->getValue());
- assert(VI && "Invalid list element!");
- return VarListElementInit::get(VI, Elt);
- }
+ if (!LI)
+ return VarListElementInit::get(cast<TypedInit>(RV->getValue()), Elt);
if (Elt >= LI->getSize())
return nullptr; // Out of range reference.
assert(TheInit != this && "Infinite loop detected!");
if (Init *I = TheInit->getFieldInit(R, RV, FieldName))
return I;
- else
- return nullptr;
+ return nullptr;
}
return nullptr;
}
VarBitInit *VarBitInit::get(TypedInit *T, unsigned B) {
typedef std::pair<TypedInit *, unsigned> Key;
- typedef DenseMap<Key, VarBitInit *> Pool;
-
- static Pool ThePool;
+ static DenseMap<Key, std::unique_ptr<VarBitInit>> ThePool;
Key TheKey(std::make_pair(T, B));
- VarBitInit *&I = ThePool[TheKey];
- if (!I) I = new VarBitInit(T, B);
- return I;
+ std::unique_ptr<VarBitInit> &I = ThePool[TheKey];
+ if (!I) I.reset(new VarBitInit(T, B));
+ return I.get();
}
std::string VarBitInit::getAsString() const {
- return TI->getAsString() + "{" + utostr(Bit) + "}";
+ return TI->getAsString() + "{" + utostr(Bit) + "}";
}
Init *VarBitInit::resolveReferences(Record &R, const RecordVal *RV) const {
VarListElementInit *VarListElementInit::get(TypedInit *T,
unsigned E) {
typedef std::pair<TypedInit *, unsigned> Key;
- typedef DenseMap<Key, VarListElementInit *> Pool;
-
- static Pool ThePool;
+ static DenseMap<Key, std::unique_ptr<VarListElementInit>> ThePool;
Key TheKey(std::make_pair(T, E));
- VarListElementInit *&I = ThePool[TheKey];
- if (!I) I = new VarListElementInit(T, E);
- return I;
+ std::unique_ptr<VarListElementInit> &I = ThePool[TheKey];
+ if (!I) I.reset(new VarListElementInit(T, E));
+ return I.get();
}
std::string VarListElementInit::getAsString() const {
Init *VarListElementInit:: resolveListElementReference(Record &R,
const RecordVal *RV,
unsigned Elt) const {
- Init *Result = TI->resolveListElementReference(R, RV, Element);
-
- if (Result) {
+ if (Init *Result = TI->resolveListElementReference(R, RV, Element)) {
if (TypedInit *TInit = dyn_cast<TypedInit>(Result)) {
Init *Result2 = TInit->resolveListElementReference(R, RV, Elt);
if (Result2) return Result2;
- return new VarListElementInit(TInit, Elt);
+ return VarListElementInit::get(TInit, Elt);
}
return Result;
}
-
+
return nullptr;
}
FieldInit *FieldInit::get(Init *R, const std::string &FN) {
typedef std::pair<Init *, TableGenStringKey> Key;
- typedef DenseMap<Key, FieldInit *> Pool;
- static Pool ThePool;
+ static DenseMap<Key, std::unique_ptr<FieldInit>> ThePool;
Key TheKey(std::make_pair(R, FN));
- FieldInit *&I = ThePool[TheKey];
- if (!I) I = new FieldInit(R, FN);
- return I;
+ std::unique_ptr<FieldInit> &I = ThePool[TheKey];
+ if (!I) I.reset(new FieldInit(R, FN));
+ return I.get();
}
Init *FieldInit::getBit(unsigned Bit) const {
Init *FieldInit::resolveReferences(Record &R, const RecordVal *RV) const {
Init *NewRec = RV ? Rec->resolveReferences(R, RV) : Rec;
- Init *BitsVal = NewRec->getFieldInit(R, RV, FieldName);
- if (BitsVal) {
+ if (Init *BitsVal = NewRec->getFieldInit(R, RV, FieldName)) {
Init *BVR = BitsVal->resolveReferences(R, RV);
return BVR->isComplete() ? BVR : const_cast<FieldInit *>(this);
}
- if (NewRec != Rec) {
+ if (NewRec != Rec)
return FieldInit::get(NewRec, FieldName);
- }
return const_cast<FieldInit *>(this);
}
DagInit::get(Init *V, const std::string &VN,
ArrayRef<Init *> ArgRange,
ArrayRef<std::string> NameRange) {
- typedef FoldingSet<DagInit> Pool;
- static Pool ThePool;
+ static FoldingSet<DagInit> ThePool;
+ static std::vector<std::unique_ptr<DagInit>> TheActualPool;
FoldingSetNodeID ID;
ProfileDagInit(ID, V, VN, ArgRange, NameRange);
DagInit *I = new DagInit(V, VN, ArgRange, NameRange);
ThePool.InsertNode(I, IP);
-
+ TheActualPool.push_back(std::unique_ptr<DagInit>(I));
return I;
}
DagInit *
DagInit::get(Init *V, const std::string &VN,
const std::vector<std::pair<Init*, std::string> > &args) {
- typedef std::pair<Init*, std::string> PairType;
-
std::vector<Init *> Args;
std::vector<std::string> Names;
- for (std::vector<PairType>::const_iterator i = args.begin(),
- iend = args.end();
- i != iend;
- ++i) {
- Args.push_back(i->first);
- Names.push_back(i->second);
+ for (const auto &Arg : args) {
+ Args.push_back(Arg.first);
+ Names.push_back(Arg.second);
}
return DagInit::get(V, VN, Args, Names);
std::string Result = "(" + Val->getAsString();
if (!ValName.empty())
Result += ":" + ValName;
- if (Args.size()) {
+ if (!Args.empty()) {
Result += " " + Args[0]->getAsString();
if (!ArgNames[0].empty()) Result += ":$" + ArgNames[0];
for (unsigned i = 1, e = Args.size(); i != e; ++i) {
}
const std::string &RecordVal::getName() const {
- StringInit *NameString = dyn_cast<StringInit>(Name);
- assert(NameString && "RecordVal name is not a string!");
- return NameString->getValue();
+ return cast<StringInit>(Name)->getValue();
}
void RecordVal::dump() const { errs() << *this; }
void Record::checkName() {
// Ensure the record name has string type.
- const TypedInit *TypedName = dyn_cast<const TypedInit>(Name);
- assert(TypedName && "Record name is not typed!");
+ const TypedInit *TypedName = cast<const TypedInit>(Name);
RecTy *Type = TypedName->getType();
if (!isa<StringRecTy>(Type))
PrintFatalError(getLoc(), "Record name is not a string!");
}
DefInit *Record::getDefInit() {
- if (!TheInit)
- TheInit = new DefInit(this, new RecordRecTy(this));
- return TheInit;
+ static DenseMap<Record *, std::unique_ptr<DefInit>> ThePool;
+ if (TheInit)
+ return TheInit;
+
+ std::unique_ptr<DefInit> &I = ThePool[this];
+ if (!I) I.reset(new DefInit(this, new RecordRecTy(this)));
+ return I.get();
}
const std::string &Record::getName() const {
- const StringInit *NameString = dyn_cast<StringInit>(Name);
- assert(NameString && "Record name is not a string!");
- return NameString->getValue();
+ return cast<StringInit>(Name)->getValue();
}
void Record::setName(Init *NewName) {
- if (TrackedRecords.getDef(Name->getAsUnquotedString()) == this) {
- TrackedRecords.removeDef(Name->getAsUnquotedString());
- TrackedRecords.addDef(this);
- } else if (TrackedRecords.getClass(Name->getAsUnquotedString()) == this) {
- TrackedRecords.removeClass(Name->getAsUnquotedString());
- TrackedRecords.addClass(this);
- } // Otherwise this isn't yet registered.
Name = NewName;
checkName();
// DO NOT resolve record values to the name at this point because
continue;
if (Init *V = Values[i].getValue())
if (Values[i].setValue(V->resolveReferences(*this, RV)))
- PrintFatalError(getLoc(), "Invalid value is found when setting '"
- + Values[i].getNameInitAsString()
- + "' after resolving references"
- + (RV ? " against '" + RV->getNameInitAsString()
- + "' of ("
- + RV->getValue()->getAsUnquotedString() + ")"
- : "")
- + "\n");
+ PrintFatalError(getLoc(), "Invalid value is found when setting '" +
+ Values[i].getNameInitAsString() +
+ "' after resolving references" +
+ (RV ? " against '" + RV->getNameInitAsString() +
+ "' of (" + RV->getValue()->getAsUnquotedString() +
+ ")"
+ : "") + "\n");
}
Init *OldName = getNameInit();
Init *NewName = Name->resolveReferences(*this, RV);
ListInit *List = getValueAsListInit(FieldName);
std::vector<Record*> Defs;
for (unsigned i = 0; i < List->getSize(); i++) {
- if (DefInit *DI = dyn_cast<DefInit>(List->getElement(i))) {
+ if (DefInit *DI = dyn_cast<DefInit>(List->getElement(i)))
Defs.push_back(DI->getDef());
- } else {
+ else
PrintFatalError(getLoc(), "Record `" + getName() + "', field `" +
FieldName + "' list is not entirely DefInit!");
- }
}
return Defs;
}
ListInit *List = getValueAsListInit(FieldName);
std::vector<int64_t> Ints;
for (unsigned i = 0; i < List->getSize(); i++) {
- if (IntInit *II = dyn_cast<IntInit>(List->getElement(i))) {
+ if (IntInit *II = dyn_cast<IntInit>(List->getElement(i)))
Ints.push_back(II->getValue());
- } else {
+ else
PrintFatalError(getLoc(), "Record `" + getName() + "', field `" +
FieldName + "' does not have a list of ints initializer!");
- }
}
return Ints;
}
ListInit *List = getValueAsListInit(FieldName);
std::vector<std::string> Strings;
for (unsigned i = 0; i < List->getSize(); i++) {
- if (StringInit *II = dyn_cast<StringInit>(List->getElement(i))) {
+ if (StringInit *II = dyn_cast<StringInit>(List->getElement(i)))
Strings.push_back(II->getValue());
- } else {
+ else
PrintFatalError(getLoc(), "Record `" + getName() + "', field `" +
FieldName + "' does not have a list of strings initializer!");
- }
}
return Strings;
}
PrintFatalError(getLoc(), "Record `" + getName() +
"' does not have a field named `" + FieldName.str() + "'!\n");
- if (R->getValue() == UnsetInit::get()) {
+ if (isa<UnsetInit>(R->getValue())) {
Unset = true;
return false;
}
Rec.dump();
errs() << "Defs:\n";
- for (RecordVector::const_iterator r = DefPrototypes.begin(),
- rend = DefPrototypes.end();
- r != rend;
- ++r) {
- (*r)->dump();
- }
+ for (const auto &Proto : DefPrototypes)
+ Proto->dump();
}
raw_ostream &llvm::operator<<(raw_ostream &OS, const RecordKeeper &RK) {
OS << "------------- Classes -----------------\n";
- const std::map<std::string, Record*> &Classes = RK.getClasses();
- for (std::map<std::string, Record*>::const_iterator I = Classes.begin(),
- E = Classes.end(); I != E; ++I)
- OS << "class " << *I->second;
+ for (const auto &C : RK.getClasses())
+ OS << "class " << *C.second;
OS << "------------- Defs -----------------\n";
- const std::map<std::string, Record*> &Defs = RK.getDefs();
- for (std::map<std::string, Record*>::const_iterator I = Defs.begin(),
- E = Defs.end(); I != E; ++I)
- OS << "def " << *I->second;
+ for (const auto &D : RK.getDefs())
+ OS << "def " << *D.second;
return OS;
}
PrintFatalError("ERROR: Couldn't find the `" + ClassName + "' class!\n");
std::vector<Record*> Defs;
- for (std::map<std::string, Record*>::const_iterator I = getDefs().begin(),
- E = getDefs().end(); I != E; ++I)
- if (I->second->isSubClassOf(Class))
- Defs.push_back(I->second);
+ for (const auto &D : getDefs())
+ if (D.second->isSubClassOf(Class))
+ Defs.push_back(D.second.get());
return Defs;
}
/// to CurRec's name.
Init *llvm::QualifyName(Record &CurRec, MultiClass *CurMultiClass,
Init *Name, const std::string &Scoper) {
- RecTy *Type = dyn_cast<TypedInit>(Name)->getType();
+ RecTy *Type = cast<TypedInit>(Name)->getType();
BinOpInit *NewName =
BinOpInit::get(BinOpInit::STRCONCAT,
projects / oota-llvm.git / blobdiff