diff --git a/llvm/lib/TableGen/Record.cpp b/llvm/lib/TableGen/Record.cpp index 97e185bbd1267..59884c78565a6 100644 --- a/llvm/lib/TableGen/Record.cpp +++ b/llvm/lib/TableGen/Record.cpp @@ -334,11 +334,10 @@ static const RecordRecTy *resolveRecordTypes(const RecordRecTy *T1, while (!Stack.empty()) { const Record *R = Stack.pop_back_val(); - if (T2->isSubClassOf(R)) { + if (T2->isSubClassOf(R)) CommonSuperClasses.push_back(R); - } else { - append_range(Stack, make_first_range(R->getDirectSuperClasses())); - } + else + llvm::append_range(Stack, make_first_range(R->getDirectSuperClasses())); } return RecordRecTy::get(T1->getRecordKeeper(), CommonSuperClasses); @@ -2733,11 +2732,8 @@ const DagInit *DagInit::get(const Init *V, const StringInit *VN, const DagInit *DagInit::get( const Init *V, const StringInit *VN, ArrayRef> ArgAndNames) { - SmallVector Args; - SmallVector Names; - - llvm::append_range(Args, make_first_range(ArgAndNames)); - llvm::append_range(Names, make_second_range(ArgAndNames)); + SmallVector Args(make_first_range(ArgAndNames)); + SmallVector Names(make_second_range(ArgAndNames)); return DagInit::get(V, VN, Args, Names); } @@ -2901,8 +2897,8 @@ void Record::checkName() { } const RecordRecTy *Record::getType() const { - SmallVector DirectSCs; - append_range(DirectSCs, make_first_range(getDirectSuperClasses())); + SmallVector DirectSCs( + make_first_range(getDirectSuperClasses())); return RecordRecTy::get(TrackedRecords, DirectSCs); } diff --git a/llvm/utils/TableGen/Common/CodeGenRegisters.cpp b/llvm/utils/TableGen/Common/CodeGenRegisters.cpp index 3b7604a05fa88..a833e488c5e33 100644 --- a/llvm/utils/TableGen/Common/CodeGenRegisters.cpp +++ b/llvm/utils/TableGen/Common/CodeGenRegisters.cpp @@ -650,8 +650,7 @@ struct TupleExpander : SetTheory::Expander { // Take the cost list of the first register in the tuple. const ListInit *CostList = Proto->getValueAsListInit("CostPerUse"); - SmallVector CostPerUse; - llvm::append_range(CostPerUse, *CostList); + SmallVector CostPerUse(CostList->getValues()); const StringInit *AsmName = StringInit::get(RK, ""); if (!RegNames.empty()) {