[Test] Ensourced shrink-borrow-scope.

Moved the test next to the code it calls.

Author: nate-chandler

lib/SILOptimizer/UtilityPasses/TestRunner.cpp

@@ -326,34 +326,6 @@ static FunctionTest IsLexicalTest("is-lexical", [](auto &function,
   llvm::errs() << boolString << "\n";
 });
 
-static FunctionTest ShrinkBorrowScopeTest(
-    "shrink-borrow-scope", [](auto &function, auto &arguments, auto &test) {
-      auto instruction = arguments.takeValue();
-      auto expected = arguments.takeBool();
-      auto *bbi = cast<BeginBorrowInst>(instruction);
-      auto *analysis = test.template getAnalysis<BasicCalleeAnalysis>();
-      SmallVector<CopyValueInst *, 4> modifiedCopyValueInsts;
-      InstructionDeleter deleter(
-          InstModCallbacks().onDelete([&](auto *instruction) {
-            llvm::errs() << "DELETED:\n";
-            instruction->dump();
-          }));
-      auto shrunk =
-          shrinkBorrowScope(*bbi, deleter, analysis, modifiedCopyValueInsts);
-      unsigned index = 0;
-      for (auto *cvi : modifiedCopyValueInsts) {
-        auto expectedCopy = arguments.takeValue();
-        llvm::errs() << "rewritten copy " << index << ":\n";
-        llvm::errs() << "expected:\n";
-        expectedCopy->print(llvm::errs());
-        llvm::errs() << "got:\n";
-        cvi->dump();
-        assert(cvi == expectedCopy);
-        ++index;
-      }
-      assert(expected == shrunk && "didn't shrink expectedly!?");
-    });
-
 // Arguments:
 // - SILValue: phi
 // Dumps:

lib/SILOptimizer/Utils/ShrinkBorrowScope.cpp

@@ -20,9 +20,11 @@
 #include "swift/SIL/OwnershipUtils.h"
 #include "swift/SIL/SILBasicBlock.h"
 #include "swift/SIL/SILInstruction.h"
+#include "swift/SIL/Test.h"
 #include "swift/SILOptimizer/Analysis/BasicCalleeAnalysis.h"
 #include "swift/SILOptimizer/Analysis/Reachability.h"
 #include "swift/SILOptimizer/Analysis/VisitBarrierAccessScopes.h"
+#include "swift/SILOptimizer/PassManager/Transforms.h"
 #include "swift/SILOptimizer/Utils/CanonicalizeBorrowScope.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
 #include "swift/SILOptimizer/Utils/InstructionDeleter.h"
@@ -490,3 +492,39 @@ bool swift::shrinkBorrowScope(
                                      calleeAnalysis);
   return ShrinkBorrowScope::run(context);
 }
+
+namespace swift::test {
+// Arguments:
+// - BeginBorrowInst - the introducer for the scope to shrink
+// - bool - the expected return value of shrinkBorrowScope
+// - variadic list of values consisting of the copies expected to be rewritten
+// Dumps:
+// - DELETED:  <<instruction deleted>>
+static FunctionTest ShrinkBorrowScopeTest(
+    "shrink-borrow-scope", [](auto &function, auto &arguments, auto &test) {
+      auto instruction = arguments.takeValue();
+      auto expected = arguments.takeBool();
+      auto *bbi = cast<BeginBorrowInst>(instruction);
+      auto *analysis = test.template getAnalysis<BasicCalleeAnalysis>();
+      SmallVector<CopyValueInst *, 4> modifiedCopyValueInsts;
+      InstructionDeleter deleter(
+          InstModCallbacks().onDelete([&](auto *instruction) {
+            llvm::errs() << "DELETED:\n";
+            instruction->dump();
+          }));
+      auto shrunk =
+          shrinkBorrowScope(*bbi, deleter, analysis, modifiedCopyValueInsts);
+      unsigned index = 0;
+      for (auto *cvi : modifiedCopyValueInsts) {
+        auto expectedCopy = arguments.takeValue();
+        llvm::errs() << "rewritten copy " << index << ":\n";
+        llvm::errs() << "expected:\n";
+        expectedCopy->print(llvm::errs());
+        llvm::errs() << "got:\n";
+        cvi->dump();
+        assert(cvi == expectedCopy);
+        ++index;
+      }
+      assert(expected == shrunk && "didn't shrink expectedly!?");
+    });
+} // namespace swift::test