[Test] Ensourced simplify-cfg-simplify-switch....

-enum-block.  Moved the test next to the code it calls.

Author: nate-chandler

lib/SILOptimizer/Transforms/SimplifyCFG.cpp

@@ -2138,6 +2138,24 @@ bool SimplifyCFG::simplifySwitchEnumBlock(SwitchEnumInst *SEI) {
   return true;
 }
 
+namespace swift::test {
+/// Arguments:
+/// - SwitchEnumInst - the instruction to to simplify
+/// Dumps:
+/// - nothing
+static FunctionTest SimplifyCFGSimplifySwitchEnumBlock(
+    "simplify-cfg-simplify-switch-enum-block",
+    [](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)
+          .simplifySwitchEnumBlock(
+              cast<SwitchEnumInst>(arguments.takeInstruction()));
+    });
+} // end namespace swift::test
+
 /// simplifySwitchValueBlock - Simplify a basic block that ends with a
 /// switch_value instruction that gets its operand from an integer
 /// literal instruction.

lib/SILOptimizer/UtilityPasses/TestRunner.cpp

@@ -315,18 +315,6 @@ static FunctionTest FieldSensitiveMultiDefUseLiveRangeTest(
 // MARK: SimplifyCFG Unit Tests
 //===----------------------------------------------------------------------===//
 
-static FunctionTest SimplifyCFGSimplifySwitchEnumBlock(
-    "simplify-cfg-simplify-switch-enum-block",
-    [](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)
-          .simplifySwitchEnumBlock(
-              cast<SwitchEnumInst>(arguments.takeInstruction()));
-    });
-
 static FunctionTest SimplifyCFGSwitchEnumOnObjcClassOptional(
     "simplify-cfg-simplify-switch-enum-on-objc-class-optional",
     [](auto &function, auto &arguments, auto &test) {