Optimizer: convert the UpdateBorrowedFromPass pass to a test

And remove the now empty TestPasses directory.

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/CMakeLists.txt

@@ -17,5 +17,4 @@ add_subdirectory(InstructionSimplification)
 add_subdirectory(PassManager)
 add_subdirectory(ModulePasses)
 add_subdirectory(FunctionPasses)
-add_subdirectory(TestPasses)
 add_subdirectory(Utilities)

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

@@ -146,9 +146,6 @@ private func registerSwiftPasses() {
   registerForSILCombine(ApplyInst.self,             { run(ApplyInst.self, $0) })
   registerForSILCombine(TryApplyInst.self,          { run(TryApplyInst.self, $0) })
   registerForSILCombine(EndCOWMutationAddrInst.self, { run(EndCOWMutationAddrInst.self, $0) })
-
-  // Test passes
-  registerPass(updateBorrowedFromPass, { updateBorrowedFromPass.run($0) })
 }
 
 private func registerSwiftAnalyses() {

SwiftCompilerSources/Sources/Optimizer/TestPasses/CMakeLists.txt

@@ -263,3 +263,13 @@ func registerPhiUpdater() {
     public let notifyInstructionChanged: (Instruction) -> () = { inst in }
   }
 }
+
+//===--------------------------------------------------------------------===//
+//                              Tests
+//===--------------------------------------------------------------------===//
+
+let updateBorrowedFromTest = Test("update_borrowed_from") {
+  function, arguments, context in
+
+  updateBorrowedFrom(in: function, context)
+}

SwiftCompilerSources/Sources/Optimizer/TestPasses/UpdateBorrowedFrom.swift

@@ -147,6 +147,7 @@ public func registerTests() {
     smallProjectionPathTest,
     getAccessBaseTest,
     accessPathTest,
+    updateBorrowedFromTest,
     borrowIntroducersTest,
     enclosingValuesTest,
     forwardingDefUseTest,

SwiftCompilerSources/Sources/SIL/Utilities/PhiUpdater.swift

@@ -130,8 +130,6 @@ PASS(StripObjectHeaders, "strip-object-headers",
     "Sets the bare flag on objects which don't need their headers")
 PASS(StackPromotion, "stack-promotion",
      "Stack Promotion of Class Objects")
-PASS(UpdateBorrowedFrom, "update-borrowed-from",
-     "Test pass for update borrowed-from instructions")
 PASS(MandatoryTempRValueElimination, "mandatory-temp-rvalue-elimination",
      "Mandatory remove short-lived immutable temporary copies")
 PASS(TempRValueElimination, "temp-rvalue-elimination",

SwiftCompilerSources/Sources/SIL/Utilities/Test.swift

@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -update-borrowed-from -enable-sil-verify-all=0 -o /dev/null %s 2>&1
+// RUN: %target-sil-opt -enable-sil-verify-all=0 -o /dev/null %s 2>&1
 
 // REQUIRES: asserts
 
@@ -192,7 +192,8 @@ bb1:
 bb2:
   %borrow2 = begin_borrow %0 : $C
   br bb3(%borrow2 : $C, %0 : $C)
-bb3(%borrow3 : @guaranteed $C, %copy3 : @owned $C):
+bb3(%11 : @guaranteed $C, %copy3 : @owned $C):
+  %borrow3 = borrowed %11 from (%copy3)
   end_borrow %borrow3 : $C
   destroy_value %copy3 : $C
   %result = tuple ()