[Test] Ensourced scoped-address-liveness.

Moved the test next to the code it calls.

Author: nate-chandler

lib/SIL/Utils/ScopedAddressUtils.cpp

@@ -16,6 +16,7 @@
 #include "swift/SIL/SILArgument.h"
 #include "swift/SIL/SILBuilder.h"
 #include "swift/SIL/SILInstruction.h"
+#include "swift/SIL/Test.h"
 #include "swift/SILOptimizer/Utils/InstructionDeleter.h"
 #include "swift/SILOptimizer/Utils/OwnershipOptUtils.h"
 
@@ -105,6 +106,31 @@ AddressUseKind ScopedAddressValue::computeTransitiveLiveness(
   return updateTransitiveLiveness(liveness);
 }
 
+namespace swift::test {
+// Arguments:
+// - SILValue: value to a analyze
+// Dumps:
+// - the liveness result and boundary
+static FunctionTest ScopedAddressLivenessTest(
+    "scoped-address-liveness", [](auto &function, auto &arguments, auto &test) {
+      auto value = arguments.takeValue();
+      assert(!arguments.hasUntaken());
+      llvm::outs() << "Scoped address analysis: " << value;
+
+      ScopedAddressValue scopedAddress(value);
+      assert(scopedAddress);
+
+      SmallVector<SILBasicBlock *, 8> discoveredBlocks;
+      SSAPrunedLiveness liveness(value->getFunction(), &discoveredBlocks);
+      scopedAddress.computeTransitiveLiveness(liveness);
+      liveness.print(llvm::outs());
+
+      PrunedLivenessBoundary boundary;
+      liveness.computeBoundary(boundary);
+      boundary.print(llvm::outs());
+    });
+} // end namespace swift::test
+
 AddressUseKind ScopedAddressValue::updateTransitiveLiveness(
     SSAPrunedLiveness &liveness) const {
   SmallVector<Operand *, 4> uses;

lib/SILOptimizer/UtilityPasses/TestRunner.cpp

@@ -230,29 +230,6 @@ static FunctionTest TestSpecificationTest(
 // MARK: OSSA Lifetime Unit Tests
 //===----------------------------------------------------------------------===//
 
-// Arguments:
-// - SILValue: value to a analyze
-// Dumps:
-// - the liveness result and boundary
-static FunctionTest ScopedAddressLivenessTest(
-    "scoped-address-liveness", [](auto &function, auto &arguments, auto &test) {
-      auto value = arguments.takeValue();
-      assert(!arguments.hasUntaken());
-      llvm::outs() << "Scoped address analysis: " << value;
-
-      ScopedAddressValue scopedAddress(value);
-      assert(scopedAddress);
-
-      SmallVector<SILBasicBlock *, 8> discoveredBlocks;
-      SSAPrunedLiveness liveness(value->getFunction(), &discoveredBlocks);
-      scopedAddress.computeTransitiveLiveness(liveness);
-      liveness.print(llvm::outs());
-
-      PrunedLivenessBoundary boundary;
-      liveness.computeBoundary(boundary);
-      boundary.print(llvm::outs());
-    });
-
 // Arguments:
 // - variadic list of live-range defining values or instructions
 // Dumps: