[Test] Ensourced simplify-cfg-simplify-block-args.

Moved the test next to the code it calls.

Author: nate-chandler

include/swift/SILOptimizer/Transforms/SimplifyCFG.h

@@ -20,6 +20,10 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
 
+namespace swift {
+class DominanceAnalysis;
+}
+
 using namespace swift;
 
 struct ThreadInfo;

lib/SILOptimizer/Transforms/SimplifyCFG.cpp

@@ -3547,6 +3547,23 @@ bool SimplifyCFG::simplifyBlockArgs() {
   return Changed;
 }
 
+namespace swift::test {
+/// Arguments:
+/// - none
+/// Dumps:
+/// - nothing
+static FunctionTest SimplifyCFGSimplifyBlockArgs(
+    "simplify-cfg-simplify-block-args",
+    [](auto &function, auto &arguments, auto &test) {
+      auto *passToRun = cast<SILFunctionTransform>(createSimplifyCFG());
+      passToRun->injectPassManager(test.getPassManager());
+      passToRun->injectFunction(&function);
+      SimplifyCFG(function, *passToRun, /*VerifyAll=*/false,
+                  /*EnableJumpThread=*/false)
+          .simplifyBlockArgs();
+    });
+} // end namespace swift::test
+
 // Attempt to simplify the ith argument of BB.  We simplify cases
 // where there is a single use of the argument that is an extract from
 // a struct, tuple or enum and where the predecessors all build the struct,

lib/SILOptimizer/UtilityPasses/TestRunner.cpp

@@ -315,17 +315,6 @@ static FunctionTest FieldSensitiveMultiDefUseLiveRangeTest(
 // MARK: SimplifyCFG Unit Tests
 //===----------------------------------------------------------------------===//
 
-static FunctionTest SimplifyCFGSimplifyBlockArgs(
-    "simplify-cfg-simplify-block-args",
-    [](auto &function, auto &arguments, auto &test) {
-      auto *passToRun = cast<SILFunctionTransform>(createSimplifyCFG());
-      passToRun->injectPassManager(test.getPassManager());
-      passToRun->injectFunction(&function);
-      SimplifyCFG(function, *passToRun, /*VerifyAll=*/false,
-                  /*EnableJumpThread=*/false)
-          .simplifyBlockArgs();
-    });
-
 static FunctionTest SimplifyCFGCanonicalizeSwitchEnum(
     "simplify-cfg-canonicalize-switch-enum",
     [](auto &function, auto &arguments, auto &test) {