NFC: Remove unused code + reorg

Author: meg-gupta

include/swift/SIL/OwnershipUtils.h

@@ -478,13 +478,7 @@ struct BorrowingOperand {
   /// set of its operands uses.
   ///
   /// E.x.: end_apply uses.
-  ///
-  /// \p errorFunction a callback that if non-null is passed an operand that
-  /// triggers a mal-formed SIL error. This is just needed for the ownership
-  /// verifier to emit good output.
-  void getImplicitUses(
-      SmallVectorImpl<Operand *> &foundUses,
-      std::function<void(Operand *)> *errorFunction = nullptr) const;
+  void getImplicitUses(SmallVectorImpl<Operand *> &foundUses) const;
 
   void print(llvm::raw_ostream &os) const;
   SWIFT_DEBUG_DUMP { print(llvm::dbgs()); }

lib/SIL/IR/SILArgument.cpp

@@ -240,9 +240,8 @@ bool SILPhiArgument::visitTransitiveIncomingPhiOperands(
     argument->getIncomingPhiOperands(operands);
 
     for (auto *operand : operands) {
-      SILPhiArgument *forwarded;
-      if ((forwarded = dyn_cast<SILPhiArgument>(operand->get())) &&
-          forwarded->isPhi()) {
+      SILPhiArgument *forwarded = dyn_cast<SILPhiArgument>(operand->get());
+      if (forwarded && forwarded->isPhi()) {
         worklist.insert(forwarded);
       }
       if (!visitor(argument, operand))

lib/SIL/Utils/OwnershipUtils.cpp

@@ -706,8 +706,7 @@ BorrowedValue BorrowingOperand::getBorrowIntroducingUserResult() {
 }
 
 void BorrowingOperand::getImplicitUses(
-    SmallVectorImpl<Operand *> &foundUses,
-    std::function<void(Operand *)> *errorFunction) const {
+    SmallVectorImpl<Operand *> &foundUses) const {
   // FIXME: this visitScopeEndingUses should never return false once dead
   // borrows are disallowed.
   if (!visitScopeEndingUses([&](Operand *endOp) {

lib/SIL/Verifier/SILOwnershipVerifier.cpp

@@ -254,14 +254,7 @@ bool SILValueOwnershipChecker::gatherNonGuaranteedUsers(
     // initial end scope instructions without any further work.
     //
     // Maybe: Is borrow scope non-local?
-    std::function<void(Operand *)> error = [&](Operand *op) {
-      errorBuilder.handleMalformedSIL([&] {
-        llvm::errs() << "Implicit Regular User Guaranteed Phi Cycle!\n"
-                     << "User: " << *op->getUser()
-                     << "Initial: " << *initialScopedOperand << "\n";
-      });
-    };
-    initialScopedOperand.getImplicitUses(nonLifetimeEndingUsers, &error);
+    initialScopedOperand.getImplicitUses(nonLifetimeEndingUsers);
     if (initialScopedOperand.kind == BorrowingOperandKind::BeginBorrow) {
       guaranteedPhiVerifier.verifyReborrows(
           cast<BeginBorrowInst>(op->getUser()));
@@ -361,15 +354,7 @@ bool SILValueOwnershipChecker::gatherUsers(
       if (auto scopedOperand = BorrowingOperand(op)) {
         assert(!scopedOperand.isReborrow());
 
-        std::function<void(Operand *)> onError = [&](Operand *op) {
-          errorBuilder.handleMalformedSIL([&] {
-            llvm::errs() << "Implicit Regular User Guaranteed Phi Cycle!\n"
-                         << "User: " << *op->getUser()
-                         << "Initial: " << *scopedOperand << "\n";
-          });
-        };
-
-        scopedOperand.getImplicitUses(nonLifetimeEndingUsers, &onError);
+        scopedOperand.getImplicitUses(nonLifetimeEndingUsers);
         if (scopedOperand.kind == BorrowingOperandKind::BeginBorrow) {
           guaranteedPhiVerifier.verifyReborrows(
               cast<BeginBorrowInst>(op->getUser()));