Skip to content

Commit 736b1af

Browse files
committed
[Test] Ensourced simplify-cfg-simplify-switch....
-enum-unreachable-blocks. Moved the test next to the code it calls.
1 parent d57b1e5 commit 736b1af

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

lib/SILOptimizer/Transforms/SimplifyCFG.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1790,6 +1790,24 @@ bool SimplifyCFG::simplifySwitchEnumUnreachableBlocks(SwitchEnumInst *SEI) {
17901790
return true;
17911791
}
17921792

1793+
namespace swift::test {
1794+
/// Arguments:
1795+
/// - SwitchEnumInst - the instruction to to simplify
1796+
/// Dumps:
1797+
/// - nothing
1798+
static FunctionTest SimplifyCFGSimplifySwitchEnumUnreachableBlocks(
1799+
"simplify-cfg-simplify-switch-enum-unreachable-blocks",
1800+
[](auto &function, auto &arguments, auto &test) {
1801+
auto *passToRun = cast<SILFunctionTransform>(createSimplifyCFG());
1802+
passToRun->injectPassManager(test.getPassManager());
1803+
passToRun->injectFunction(&function);
1804+
SimplifyCFG(function, *passToRun, /*VerifyAll=*/false,
1805+
/*EnableJumpThread=*/false)
1806+
.simplifySwitchEnumUnreachableBlocks(
1807+
cast<SwitchEnumInst>(arguments.takeInstruction()));
1808+
});
1809+
} // end namespace swift::test
1810+
17931811
/// Checks that the someBB only contains obj_method calls (possibly chained) on
17941812
/// the optional value.
17951813
///

lib/SILOptimizer/UtilityPasses/TestRunner.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -315,18 +315,6 @@ static FunctionTest FieldSensitiveMultiDefUseLiveRangeTest(
315315
// MARK: SimplifyCFG Unit Tests
316316
//===----------------------------------------------------------------------===//
317317

318-
static FunctionTest SimplifyCFGSimplifySwitchEnumUnreachableBlocks(
319-
"simplify-cfg-simplify-switch-enum-unreachable-blocks",
320-
[](auto &function, auto &arguments, auto &test) {
321-
auto *passToRun = cast<SILFunctionTransform>(createSimplifyCFG());
322-
passToRun->injectPassManager(test.getPassManager());
323-
passToRun->injectFunction(&function);
324-
SimplifyCFG(function, *passToRun, /*VerifyAll=*/false,
325-
/*EnableJumpThread=*/false)
326-
.simplifySwitchEnumUnreachableBlocks(
327-
cast<SwitchEnumInst>(arguments.takeInstruction()));
328-
});
329-
330318
static FunctionTest SimplifyCFGSimplifyTermWithIdenticalDestBlocks(
331319
"simplify-cfg-simplify-term-with-identical-dest-blocks",
332320
[](auto &function, auto &arguments, auto &test) {

0 commit comments

Comments
 (0)