diff options
author | Rahul Joshi <rjoshi@nvidia.com> | 2025-05-19 12:16:33 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-05-19 12:16:33 -0700 |
commit | 3932360b14c390188977a53ecba6c13fff685aae (patch) | |
tree | 41facadd367f7ca6dc0b213fe554e36c0e045b1a /llvm/utils | |
parent | 0f38543df55575562c75e1227fc9ada22417fa8f (diff) | |
download | llvm-3932360b14c390188977a53ecba6c13fff685aae.zip llvm-3932360b14c390188977a53ecba6c13fff685aae.tar.gz llvm-3932360b14c390188977a53ecba6c13fff685aae.tar.bz2 |
[LLVM][TableGen] Rename `ListInit::getValues()` to `getElements()` (#140289)
Rename `ListInit::getValues()` to `getElements()` to better match with
other `ListInit` members like `getElement`. Keep `getValues()` for
existing downstream code but mark it deprecated.
Diffstat (limited to 'llvm/utils')
-rw-r--r-- | llvm/utils/TableGen/AsmMatcherEmitter.cpp | 2 | ||||
-rw-r--r-- | llvm/utils/TableGen/Basic/IntrinsicEmitter.cpp | 2 | ||||
-rw-r--r-- | llvm/utils/TableGen/CallingConvEmitter.cpp | 2 | ||||
-rw-r--r-- | llvm/utils/TableGen/CodeGenMapTable.cpp | 8 | ||||
-rw-r--r-- | llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp | 10 | ||||
-rw-r--r-- | llvm/utils/TableGen/Common/CodeGenRegisters.cpp | 2 | ||||
-rw-r--r-- | llvm/utils/TableGen/GlobalISelCombinerEmitter.cpp | 2 | ||||
-rw-r--r-- | llvm/utils/TableGen/GlobalISelEmitter.cpp | 4 | ||||
-rw-r--r-- | llvm/utils/TableGen/OptionParserEmitter.cpp | 7 |
9 files changed, 19 insertions, 20 deletions
diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp index 1e8f3ed..2771fac 100644 --- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp +++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp @@ -1402,7 +1402,7 @@ void AsmMatcherInfo::buildOperandClasses() { CI->Kind = ClassInfo::UserClass0 + Index; const ListInit *Supers = Rec->getValueAsListInit("SuperClasses"); - for (const Init *I : Supers->getValues()) { + for (const Init *I : Supers->getElements()) { const DefInit *DI = dyn_cast<DefInit>(I); if (!DI) { PrintError(Rec->getLoc(), "Invalid super class reference!"); diff --git a/llvm/utils/TableGen/Basic/IntrinsicEmitter.cpp b/llvm/utils/TableGen/Basic/IntrinsicEmitter.cpp index e7fc525..897788f 100644 --- a/llvm/utils/TableGen/Basic/IntrinsicEmitter.cpp +++ b/llvm/utils/TableGen/Basic/IntrinsicEmitter.cpp @@ -301,7 +301,7 @@ static TypeSigTy ComputeTypeSignature(const CodeGenIntrinsic &Int) { const Record *TypeInfo = Int.TheDef->getValueAsDef("TypeInfo"); const ListInit *TypeList = TypeInfo->getValueAsListInit("TypeSig"); - for (const auto *TypeListEntry : TypeList->getValues()) + for (const auto *TypeListEntry : TypeList->getElements()) TypeSig.emplace_back(cast<IntInit>(TypeListEntry)->getValue()); return TypeSig; } diff --git a/llvm/utils/TableGen/CallingConvEmitter.cpp b/llvm/utils/TableGen/CallingConvEmitter.cpp index 6a2a244..3084d90 100644 --- a/llvm/utils/TableGen/CallingConvEmitter.cpp +++ b/llvm/utils/TableGen/CallingConvEmitter.cpp @@ -154,7 +154,7 @@ void CallingConvEmitter::emitAction(const Record *Action, indent Indent, O << Indent << "static const MCPhysReg " << RLName << "[] = {\n"; O << Indent << " "; ListSeparator LS; - for (const Init *V : RL->getValues()) + for (const Init *V : RL->getElements()) O << LS << getQualifiedRegisterName(V); O << "\n" << Indent << "};\n"; }; diff --git a/llvm/utils/TableGen/CodeGenMapTable.cpp b/llvm/utils/TableGen/CodeGenMapTable.cpp index bce7278..eccd1af 100644 --- a/llvm/utils/TableGen/CodeGenMapTable.cpp +++ b/llvm/utils/TableGen/CodeGenMapTable.cpp @@ -137,7 +137,7 @@ public: "' has empty " + "`ValueCols' field!"); - for (const Init *I : ColValList->getValues()) { + for (const Init *I : ColValList->getElements()) { const auto *ColI = cast<ListInit>(I); // Make sure that all the sub-lists in 'ValueCols' have same number of @@ -228,7 +228,7 @@ void MapTableEmitter::buildRowInstrMap() { for (const Record *CurInstr : InstrDefs) { std::vector<const Init *> KeyValue; const ListInit *RowFields = InstrMapDesc.getRowFields(); - for (const Init *RowField : RowFields->getValues()) { + for (const Init *RowField : RowFields->getElements()) { const RecordVal *RecVal = CurInstr->getValue(RowField); if (RecVal == nullptr) PrintFatalError(CurInstr->getLoc(), @@ -303,7 +303,7 @@ const Record *MapTableEmitter::getInstrForColumn(const Record *KeyInstr, std::vector<const Init *> KeyValue; // Construct KeyValue using KeyInstr's values for RowFields. - for (const Init *RowField : RowFields->getValues()) { + for (const Init *RowField : RowFields->getElements()) { const Init *KeyInstrVal = KeyInstr->getValue(RowField)->getValue(); KeyValue.push_back(KeyInstrVal); } @@ -475,7 +475,7 @@ void MapTableEmitter::emitTablesWithFunc(raw_ostream &OS) { OS << "// " << InstrMapDesc.getName() << "\nLLVM_READONLY\n"; OS << "int " << InstrMapDesc.getName() << "(uint16_t Opcode"; if (ValueCols.size() > 1) { - for (const Init *CF : ColFields->getValues()) { + for (const Init *CF : ColFields->getElements()) { std::string ColName = CF->getAsUnquotedString(); OS << ", enum " << ColName << " in" << ColName; } diff --git a/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp b/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp index 45f1446..f03cbd9 100644 --- a/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp +++ b/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp @@ -1012,7 +1012,7 @@ std::string TreePredicateFn::getPredCode() const { " if ("; ListSeparator LS(" && "); - for (const Init *Val : AddressSpaces->getValues()) { + for (const Init *Val : AddressSpaces->getElements()) { Code += LS; const IntInit *IntVal = dyn_cast<IntInit>(Val); @@ -1489,7 +1489,7 @@ int PatternToMatch::getPatternComplexity(const CodeGenDAGPatterns &CGP) const { void PatternToMatch::getPredicateRecords( SmallVectorImpl<const Record *> &PredicateRecs) const { - for (const Init *I : Predicates->getValues()) { + for (const Init *I : Predicates->getElements()) { if (const DefInit *Pred = dyn_cast<DefInit>(I)) { const Record *Def = Pred->getDef(); if (!Def->isSubClassOf("Predicate")) { @@ -1934,7 +1934,7 @@ static unsigned GetNumNodeResults(const Record *Operator, const ListInit *LI = Operator->getValueAsListInit("Fragments"); assert(LI && "Invalid Fragment"); unsigned NumResults = 0; - for (const Init *I : LI->getValues()) { + for (const Init *I : LI->getElements()) { const Record *Op = nullptr; if (const DagInit *Dag = dyn_cast<DagInit>(I)) if (const DefInit *DI = dyn_cast<DefInit>(Dag->getOperator())) @@ -2855,7 +2855,7 @@ TreePattern::TreePattern(const Record *TheRec, const ListInit *RawPat, bool isInput, CodeGenDAGPatterns &cdp) : TheRecord(TheRec), CDP(cdp), isInputPattern(isInput), HasError(false), Infer(*this) { - for (const Init *I : RawPat->getValues()) + for (const Init *I : RawPat->getElements()) Trees.push_back(ParseTreePattern(I, "")); } @@ -3766,7 +3766,7 @@ static bool hasNullFragReference(const DagInit *DI) { /// hasNullFragReference - Return true if any DAG in the list references /// the null_frag operator. static bool hasNullFragReference(const ListInit *LI) { - for (const Init *I : LI->getValues()) { + for (const Init *I : LI->getElements()) { const DagInit *DI = dyn_cast<DagInit>(I); assert(DI && "non-dag in an instruction Pattern list?!"); if (hasNullFragReference(DI)) diff --git a/llvm/utils/TableGen/Common/CodeGenRegisters.cpp b/llvm/utils/TableGen/Common/CodeGenRegisters.cpp index a833e48..2103bc2 100644 --- a/llvm/utils/TableGen/Common/CodeGenRegisters.cpp +++ b/llvm/utils/TableGen/Common/CodeGenRegisters.cpp @@ -770,7 +770,7 @@ CodeGenRegisterClass::CodeGenRegisterClass(CodeGenRegBank &RegBank, // Alternative allocation orders may be subsets. SetTheory::RecSet Order; - for (auto [Idx, AltOrderElem] : enumerate(AltOrders->getValues())) { + for (auto [Idx, AltOrderElem] : enumerate(AltOrders->getElements())) { RegBank.getSets().evaluate(AltOrderElem, Order, R->getLoc()); Orders[1 + Idx].append(Order.begin(), Order.end()); // Verify that all altorder members are regclass members. diff --git a/llvm/utils/TableGen/GlobalISelCombinerEmitter.cpp b/llvm/utils/TableGen/GlobalISelCombinerEmitter.cpp index 9fcce0b..090e6bb 100644 --- a/llvm/utils/TableGen/GlobalISelCombinerEmitter.cpp +++ b/llvm/utils/TableGen/GlobalISelCombinerEmitter.cpp @@ -1404,7 +1404,7 @@ bool CombineRuleBuilder::addFeaturePredicates(RuleMatcher &M) { return true; const ListInit *Preds = RuleDef.getValueAsListInit("Predicates"); - for (const Init *PI : Preds->getValues()) { + for (const Init *PI : Preds->getElements()) { const DefInit *Pred = dyn_cast<DefInit>(PI); if (!Pred) continue; diff --git a/llvm/utils/TableGen/GlobalISelEmitter.cpp b/llvm/utils/TableGen/GlobalISelEmitter.cpp index 092dba5..d516879 100644 --- a/llvm/utils/TableGen/GlobalISelEmitter.cpp +++ b/llvm/utils/TableGen/GlobalISelEmitter.cpp @@ -129,7 +129,7 @@ static std::string explainPredicates(const TreePatternNode &N) { OS << " AddressSpaces=["; StringRef AddrSpaceSeparator; - for (const Init *Val : AddrSpaces->getValues()) { + for (const Init *Val : AddrSpaces->getElements()) { const IntInit *IntVal = dyn_cast<IntInit>(Val); if (!IntVal) continue; @@ -600,7 +600,7 @@ Expected<InstructionMatcher &> GlobalISelEmitter::addBuiltinPredicates( if (const ListInit *AddrSpaces = Predicate.getAddressSpaces()) { SmallVector<unsigned, 4> ParsedAddrSpaces; - for (const Init *Val : AddrSpaces->getValues()) { + for (const Init *Val : AddrSpaces->getElements()) { const IntInit *IntVal = dyn_cast<IntInit>(Val); if (!IntVal) return failedImport("Address space is not an integer"); diff --git a/llvm/utils/TableGen/OptionParserEmitter.cpp b/llvm/utils/TableGen/OptionParserEmitter.cpp index ba99015..85b2200 100644 --- a/llvm/utils/TableGen/OptionParserEmitter.cpp +++ b/llvm/utils/TableGen/OptionParserEmitter.cpp @@ -501,7 +501,7 @@ static void emitOptionParser(const RecordKeeper &Records, raw_ostream &OS) { for (const Record *VisibilityHelp : R.getValueAsListOfDefs("HelpTextsForVariants")) { ArrayRef<const Init *> Visibilities = - VisibilityHelp->getValueAsListInit("Visibilities")->getValues(); + VisibilityHelp->getValueAsListInit("Visibilities")->getElements(); std::vector<std::string> VisibilityNames; for (const Init *Visibility : Visibilities) @@ -523,11 +523,10 @@ static void emitOptionParser(const RecordKeeper &Records, raw_ostream &OS) { OS << ", "; if (!isa<UnsetInit>(R.getValueInit("Values"))) writeCstring(OS, R.getValueAsString("Values")); - else if (!isa<UnsetInit>(R.getValueInit("ValuesCode"))) { + else if (!isa<UnsetInit>(R.getValueInit("ValuesCode"))) OS << getOptionName(R) << "_Values"; - } else { + else OS << "nullptr"; - } }; auto IsMarshallingOption = [](const Record &R) { |