Do not return location info from getSuperClasses

Author: jayfoad

llvm/include/llvm/TableGen/Record.h

@@ -1719,11 +1719,10 @@ class Record {
   ArrayRef<AssertionInfo> getAssertions() const { return Assertions; }
   ArrayRef<DumpInfo> getDumps() const { return Dumps; }
 
-  void getSuperClasses(
-      SmallVectorImpl<std::pair<const Record *, SMRange>> &Classes) const {
+  void getSuperClasses(SmallVectorImpl<const Record *> &Classes) const {
     for (const auto &[SC, R] : DirectSuperClasses) {
       SC->getSuperClasses(Classes);
-      Classes.emplace_back(SC, R);
+      Classes.push_back(SC);
     }
   }
 

llvm/lib/TableGen/DetailedRecordsBackend.cpp

@@ -152,15 +152,15 @@ void DetailedRecordsEmitter::printTemplateArgs(const Record &Rec,
 // are enclosed in parentheses.
 void DetailedRecordsEmitter::printSuperclasses(const Record &Rec,
                                                raw_ostream &OS) {
-  SmallVector<std::pair<const Record *, SMRange>> Superclasses;
+  SmallVector<const Record *> Superclasses;
   Rec.getSuperClasses(Superclasses);
   if (Superclasses.empty()) {
     OS << "  Superclasses: (none)\n";
     return;
   }
 
   OS << "  Superclasses:";
-  for (const auto &[ClassRec, Loc] : Superclasses) {
+  for (const auto *ClassRec : Superclasses) {
     if (Rec.hasDirectSuperClass(ClassRec))
       OS << formatv(" {0}", ClassRec->getNameInitAsString());
     else

llvm/lib/TableGen/JSONBackend.cpp

@@ -151,9 +151,9 @@ void JSONEmitter::run(raw_ostream &OS) {
 
     json::Array SuperClasses;
     // Add this def to the instance list for each of its superclasses.
-    SmallVector<std::pair<const Record *, SMRange>> SCs;
+    SmallVector<const Record *> SCs;
     Def->getSuperClasses(SCs);
-    for (const auto &[SuperClass, Loc] : SCs) {
+    for (const auto *SuperClass : SCs) {
       std::string SuperName = SuperClass->getNameInitAsString();
       SuperClasses.push_back(SuperName);
       InstanceLists[SuperName].push_back(Name);

llvm/lib/TableGen/Record.cpp

@@ -2976,11 +2976,11 @@ raw_ostream &llvm::operator<<(raw_ostream &OS, const Record &R) {
   }
 
   OS << " {";
-  SmallVector<std::pair<const Record *, SMRange>> SC;
-  R.getSuperClasses(SC);
-  if (!SC.empty()) {
+  SmallVector<const Record *> SCs;
+  R.getSuperClasses(SCs);
+  if (!SCs.empty()) {
     OS << "\t//";
-    for (const auto &[SC, _] : SC)
+    for (const auto *SC : SCs)
       OS << " " << SC->getNameInitAsString();
   }
   OS << "\n";

llvm/lib/TableGen/SetTheory.cpp

@@ -312,9 +312,9 @@ const RecVec *SetTheory::expand(const Record *Set) {
     return &I->second;
 
   // This is the first time we see Set. Find a suitable expander.
-  SmallVector<std::pair<const Record *, SMRange>> SCs;
+  SmallVector<const Record *> SCs;
   Set->getSuperClasses(SCs);
-  for (const auto &[SuperClass, Loc] : SCs) {
+  for (const auto *SuperClass : SCs) {
     // Skip unnamed superclasses.
     if (!isa<StringInit>(SuperClass->getNameInit()))
       continue;

llvm/utils/TableGen/CallingConvEmitter.cpp

@@ -109,13 +109,12 @@ void CallingConvEmitter::emitCallingConv(const Record *CC, raw_ostream &O) {
   // Emit all of the actions, in order.
   for (unsigned I = 0, E = CCActions->size(); I != E; ++I) {
     const Record *Action = CCActions->getElementAsRecord(I);
-    SmallVector<std::pair<const Record *, SMRange>> SCs;
+    SmallVector<const Record *> SCs;
     Action->getSuperClasses(SCs);
-    SwiftAction =
-        llvm::any_of(SCs, [](const std::pair<const Record *, SMRange> &Class) {
-          std::string Name = Class.first->getNameInitAsString();
-          return StringRef(Name).starts_with("CCIfSwift");
-        });
+    SwiftAction = llvm::any_of(SCs, [](const Record *Class) {
+      std::string Name = Class->getNameInitAsString();
+      return StringRef(Name).starts_with("CCIfSwift");
+    });
 
     O << "\n";
     emitAction(Action, indent(2), O);