Optimizer: convert the DeadEndBlockDumper pass to a test

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/DataStructures/DeadEndBlocks.swift

@@ -51,3 +51,19 @@ struct DeadEndBlocks : CustomStringConvertible, NoReflectionChildren {
     worklist.deinitialize()
   }
 }
+
+//===--------------------------------------------------------------------===//
+//                              Tests
+//===--------------------------------------------------------------------===//
+
+let deadEndBlockTest = FunctionTest("deadendblocks") {
+  function, arguments, context in
+
+  print("Function \(function.name)")
+  
+  var deadEndBlocks = DeadEndBlocks(function: function, context)
+  print(deadEndBlocks)
+  defer { deadEndBlocks.deinitialize() }
+
+  print("end function \(function.name)")
+}

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

@@ -150,7 +150,6 @@ private func registerSwiftPasses() {
   // Test passes
   registerPass(functionUsesDumper, { functionUsesDumper.run($0) })
   registerPass(silPrinterPass, { silPrinterPass.run($0) })
-  registerPass(deadEndBlockDumper, { deadEndBlockDumper.run($0) })
   registerPass(rangeDumper, { rangeDumper.run($0) })
   registerPass(testInstructionIteration, { testInstructionIteration.run($0) })
   registerPass(updateBorrowedFromPass, { updateBorrowedFromPass.run($0) })

SwiftCompilerSources/Sources/Optimizer/TestPasses/CMakeLists.txt

@@ -8,7 +8,6 @@
 
 swift_compiler_sources(Optimizer
   FunctionUsesDumper.swift
-  DeadEndBlockDumper.swift
   SILPrinter.swift
   RangeDumper.swift
   UpdateBorrowedFrom.swift

SwiftCompilerSources/Sources/Optimizer/TestPasses/DeadEndBlockDumper.swift

@@ -53,6 +53,7 @@ public func registerOptimizerTests() {
     rangeOverlapsPathTest,
     variableIntroducerTest,
     destroyBarrierTest,
+    deadEndBlockTest,
     escapeInfoTest,
     addressEscapeInfoTest,
     aliasingTest,

SwiftCompilerSources/Sources/Optimizer/Utilities/FunctionTest.swift

@@ -71,8 +71,6 @@ PASS(DestroyHoisting, "destroy-hoisting",
      "Hoist destroy_value instructions")
 PASS(MandatoryDestroyHoisting, "mandatory-destroy-hoisting",
      "Hoist destroy_value instructions for non-lexical values")
-PASS(DeadEndBlockDumper, "dump-deadendblocks",
-     "Tests the DeadEndBlocks utility")
 PASS(EmbeddedWitnessCallSpecialization, "embedded-witness-call-specialization",
      "Mandatory witness method call specialization")
 PASS(ConstantCapturePropagation, "constant-capture-propagation",

include/swift/SILOptimizer/PassManager/Passes.def

@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt %s -dump-deadendblocks -o /dev/null | %FileCheck %s
+// RUN: %target-sil-opt %s -test-runner -o /dev/null | %FileCheck %s
 
 // REQUIRES: swift_in_compiler
 
@@ -12,6 +12,7 @@ import Swift
 // CHECK:       end function simple_test
 sil @simple_test : $@convention(thin) () -> () {
 bb0:
+  specify_test "deadendblocks"
   cond_br undef, bb1, bb2
 bb1:
   br bb3
@@ -29,6 +30,7 @@ sil @throwing_fun : $@convention(thin) () -> ((), @error any Error)
 // CHECK:       end function test_throw
 sil @test_throw : $@convention(thin) () -> ((), @error any Error) {
 bb0:
+  specify_test "deadendblocks"
   %0 = function_ref @throwing_fun : $@convention(thin) () -> ((), @error any Error)
   try_apply %0() : $@convention(thin) () -> ((), @error any Error), normal bb1, error bb2
 bb1(%2: $()):
@@ -43,6 +45,7 @@ bb2(%3 : $Error):
 // CHECK:       end function test_unwind
 sil @test_unwind : $@yield_once @convention(thin) () -> @yields () {
 bb0:
+  specify_test "deadendblocks"
   %t = tuple ()
   yield %t : $(), resume bb1, unwind bb2
 bb1:
@@ -56,6 +59,7 @@ bb2:
 // CHECK:       end function complex_cfg
 sil @complex_cfg : $@convention(thin) () -> ((), @error any Error) {
 bb0:
+  specify_test "deadendblocks"
   cond_br undef, bb1, bb7
 bb1:
   %0 = function_ref @throwing_fun : $@convention(thin) () -> ((), @error any Error)