Simplify API of getDirectSuperClasses

Author: jayfoad

llvm/include/llvm/TableGen/Record.h

@@ -1732,10 +1732,9 @@ class Record {
     return is_contained(make_first_range(DirectSuperClasses), SuperClass);
   }
 
-  /// Append the direct superclasses of this record to Classes.
-  void getDirectSuperClasses(
-      SmallVectorImpl<std::pair<const Record *, SMRange>> &Classes) const {
-    Classes.append(DirectSuperClasses);
+  /// Return the direct superclasses of this record.
+  ArrayRef<std::pair<const Record *, SMRange>> getDirectSuperClasses() const {
+    return DirectSuperClasses;
   }
 
   bool isTemplateArg(const Init *Name) const {

llvm/lib/TableGen/Record.cpp

@@ -327,17 +327,13 @@ static const RecordRecTy *resolveRecordTypes(const RecordRecTy *T1,
   SmallVector<const Record *, 4> CommonSuperClasses;
   SmallVector<const Record *, 4> Stack(T1->getClasses());
 
-  SmallVector<std::pair<const Record *, SMRange>> SCs;
-
   while (!Stack.empty()) {
     const Record *R = Stack.pop_back_val();
 
     if (T2->isSubClassOf(R)) {
       CommonSuperClasses.push_back(R);
     } else {
-      R->getDirectSuperClasses(SCs);
-      append_range(Stack, make_first_range(SCs));
-      SCs.clear();
+      append_range(Stack, make_first_range(R->getDirectSuperClasses()));
     }
   }
 
@@ -2874,10 +2870,8 @@ void Record::checkName() {
 }
 
 const RecordRecTy *Record::getType() const {
-  SmallVector<std::pair<const Record *, SMRange>> SCs;
-  getDirectSuperClasses(SCs);
   SmallVector<const Record *, 4> DirectSCs;
-  append_range(DirectSCs, make_first_range(SCs));
+  append_range(DirectSCs, make_first_range(getDirectSuperClasses()));
   return RecordRecTy::get(TrackedRecords, DirectSCs);
 }
 

llvm/lib/TableGen/TGParser.cpp

@@ -3995,9 +3995,8 @@ bool TGParser::ParseClass() {
   Record *CurRec = const_cast<Record *>(Records.getClass(Name));
   if (CurRec) {
     // If the body was previously defined, this is an error.
-    SmallVector<std::pair<const Record *, SMRange>> SCs;
-    CurRec->getDirectSuperClasses(SCs);
-    if (!CurRec->getValues().empty() || !SCs.empty() ||
+    if (!CurRec->getValues().empty() ||
+        !CurRec->getDirectSuperClasses().empty() ||
         !CurRec->getTemplateArgs().empty())
       return TokError("Class '" + CurRec->getNameInitAsString() +
                       "' already defined");

llvm/utils/TableGen/Common/CodeGenRegisters.cpp

@@ -703,9 +703,7 @@ struct TupleExpander : SetTheory::Expander {
                         "Register tuple redefines register '" + Name + "'.");
 
       // Copy Proto super-classes.
-      SmallVector<std::pair<const Record *, SMRange>> SCs;
-      Proto->getDirectSuperClasses(SCs);
-      for (const auto &[Super, Loc] : SCs)
+      for (const auto &[Super, Loc] : Proto->getDirectSuperClasses())
         NewReg->addDirectSuperClass(Super, Loc);
 
       // Copy Proto fields.

llvm/utils/TableGen/SearchableTableEmitter.cpp

@@ -839,9 +839,8 @@ void SearchableTableEmitter::run(raw_ostream &OS) {
   const Record *SearchableTable = Records.getClass("SearchableTable");
   for (auto &NameRec : Records.getClasses()) {
     const Record *Class = NameRec.second.get();
-    SmallVector<std::pair<const Record *, SMRange>> SCs;
-    Class->getDirectSuperClasses(SCs);
-    if (SCs.size() != 1 || !Class->isSubClassOf(SearchableTable))
+    if (Class->getDirectSuperClasses().size() != 1 ||
+        !Class->isSubClassOf(SearchableTable))
       continue;
 
     StringRef TableName = Class->getName();