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

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

Author: nate-chandler

lib/SILOptimizer/Transforms/SimplifyCFG.cpp

@@ -2793,6 +2793,23 @@ bool SimplifyCFG::canonicalizeSwitchEnums() {
   return Changed;
 }
 
+namespace swift::test {
+/// Arguments:
+/// - none
+/// Dumps:
+/// - nothing
+static FunctionTest SimplifyCFGCanonicalizeSwitchEnum(
+    "simplify-cfg-canonicalize-switch-enum",
+    [](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)
+          .canonicalizeSwitchEnums();
+    });
+} // end namespace swift::test
+
 static SILBasicBlock *isObjCMethodCallBlock(SILBasicBlock &Block) {
   auto *Branch = dyn_cast<BranchInst>(Block.getTerminator());
   if (!Branch)

lib/SILOptimizer/UtilityPasses/TestRunner.cpp

@@ -315,17 +315,6 @@ static FunctionTest FieldSensitiveMultiDefUseLiveRangeTest(
 // MARK: SimplifyCFG Unit Tests
 //===----------------------------------------------------------------------===//
 
-static FunctionTest SimplifyCFGCanonicalizeSwitchEnum(
-    "simplify-cfg-canonicalize-switch-enum",
-    [](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)
-          .canonicalizeSwitchEnums();
-    });
-
 static FunctionTest SimplifyCFGSimplifySwitchEnumBlock(
     "simplify-cfg-simplify-switch-enum-block",
     [](auto &function, auto &arguments, auto &test) {