[NFC] Move UnitTestRunner::withTest definition out of the class

Author: meg-gupta

lib/SILOptimizer/UtilityPasses/UnitTestRunner.cpp

@@ -107,6 +107,55 @@ class UnitTest {
   virtual void invoke(Arguments &arguments) = 0;
 };
 
+class UnitTestRunner : public SILFunctionTransform {
+  void printTestLifetime(bool begin, unsigned testIndex, unsigned testCount,
+                         StringRef name, ArrayRef<StringRef> components) {
+    StringRef word = begin ? "begin" : "end";
+    llvm::errs() << word << " running test " << testIndex + 1 << " of "
+                 << testCount << " on " << getFunction()->getName() << ": "
+                 << name << " with: ";
+    for (unsigned long index = 0, size = components.size(); index < size;
+         ++index) {
+      llvm::errs() << components[index];
+      if (index != size - 1) {
+        llvm::errs() << ", ";
+      }
+    }
+    llvm::errs() << "\n";
+  }
+
+  template <typename Doit>
+  void withTest(StringRef name, Doit doit);
+
+  void runTest(StringRef name, Arguments &arguments) {
+    withTest(name, [&](auto *test) { test->invoke(arguments); });
+  }
+
+  void run() override {
+    llvm::SmallVector<UnparsedSpecification, 2> testSpecifications;
+    getTestSpecifications(getFunction(), testSpecifications);
+    Arguments arguments;
+    SmallVector<StringRef, 4> components;
+    for (unsigned long index = 0, size = testSpecifications.size();
+         index < size; ++index) {
+      components.clear();
+      arguments.clear();
+      auto testSpecification = testSpecifications[index];
+      test::parseTestArgumentsFromSpecification(
+          getFunction(), testSpecification, arguments, components);
+      auto name = arguments.takeString();
+      ArrayRef<StringRef> argumentStrings = components;
+      argumentStrings = argumentStrings.drop_front();
+      printTestLifetime(/*begin=*/true, /*index=*/index, /*size=*/size, name,
+                        argumentStrings);
+      runTest(name, arguments);
+      printTestLifetime(/*begin=*/false, /*index=*/index, /*size=*/size, name,
+                        argumentStrings);
+    }
+  }
+  friend class UnitTest;
+};
+
 // Arguments:
 // - string: list of characters, each of which specifies subsequent arguments
 //           - A: (block) argument
@@ -314,25 +363,8 @@ struct ShrinkBorrowScopeTest : UnitTest {
 
 /// [new_tests] Add the new UnitTest subclass above this line.
 
-class UnitTestRunner : public SILFunctionTransform {
-  void printTestLifetime(bool begin, unsigned testIndex, unsigned testCount,
-                         StringRef name, ArrayRef<StringRef> components) {
-    StringRef word = begin ? "begin" : "end";
-    llvm::errs() << word << " running test " << testIndex + 1 << " of "
-                 << testCount << " on " << getFunction()->getName() << ": "
-                 << name << " with: ";
-    for (unsigned long index = 0, size = components.size(); index < size;
-         ++index) {
-      llvm::errs() << components[index];
-      if (index != size - 1) {
-        llvm::errs() << ", ";
-      }
-    }
-    llvm::errs() << "\n";
-  }
-
-  template <typename Doit>
-  void withTest(StringRef name, Doit doit) {
+template <typename Doit>
+void UnitTestRunner::withTest(StringRef name, Doit doit) {
 #define ADD_UNIT_TEST_SUBCLASS(STRING, SUBCLASS)                               \
   if (name == STRING) {                                                        \
     SUBCLASS it{this};                                                         \
@@ -359,34 +391,6 @@ class UnitTestRunner : public SILFunctionTransform {
 #undef ADD_UNIT_TEST_SUBCLASS
   }
 
-  void runTest(StringRef name, Arguments &arguments) {
-    withTest(name, [&](auto *test) { test->invoke(arguments); });
-  }
-
-  void run() override {
-    llvm::SmallVector<UnparsedSpecification, 2> testSpecifications;
-    getTestSpecifications(getFunction(), testSpecifications);
-    Arguments arguments;
-    SmallVector<StringRef, 4> components;
-    for (unsigned long index = 0, size = testSpecifications.size();
-         index < size; ++index) {
-      components.clear();
-      arguments.clear();
-      auto testSpecification = testSpecifications[index];
-      test::parseTestArgumentsFromSpecification(
-          getFunction(), testSpecification, arguments, components);
-      auto name = arguments.takeString();
-      ArrayRef<StringRef> argumentStrings = components;
-      argumentStrings = argumentStrings.drop_front();
-      printTestLifetime(/*begin=*/true, /*index=*/index, /*size=*/size, name,
-                        argumentStrings);
-      runTest(name, arguments);
-      printTestLifetime(/*begin=*/false, /*index=*/index, /*size=*/size, name,
-                        argumentStrings);
-    }
-  }
-  friend class UnitTest;
-};
 
 template <typename Analysis>
 Analysis *UnitTest::getAnalysis() {