Merge pull request #65114 from nate-chandler/nfc/20230412/2/delete-duplicate-api

[SIL] NFC: Removed visitBorrowIntroducingUserResults.

Author: nate-chandler

include/swift/SIL/OwnershipUtils.h

@@ -440,8 +440,8 @@ struct BorrowingOperand {
   /// values do not themselves introduce a borrow scope. In other words, they
   /// cannot be reborrowed.
   ///
-  /// If true, the visitBorrowIntroducingUserResults() can be called to acquire
-  /// each BorrowedValue that introduces a new borrow scopes.
+  /// If true, getBorrowIntroducingUserResult() can be called to acquire the
+  /// BorrowedValue that introduces a new borrow scope.
   bool hasBorrowIntroducingUser() const {
     // TODO: Can we derive this by running a borrow introducer check ourselves?
     switch (kind) {
@@ -461,19 +461,9 @@ struct BorrowingOperand {
     llvm_unreachable("Covered switch isn't covered?!");
   }
 
-  /// Visit all of the "results" of the user of this operand that are borrow
-  /// scope introducers for the specific scope that this borrow scope operand
-  /// summarizes.
-  ///
-  /// Precondition: hasBorrowIntroducingUser() is true
-  ///
-  /// Returns false and early exits if \p visitor returns false.
-  bool visitBorrowIntroducingUserResults(
-      function_ref<bool(BorrowedValue)> visitor) const;
-
-  /// If this operand's user has a single borrowed value result return a
-  /// valid BorrowedValue instance.
-  BorrowedValue getBorrowIntroducingUserResult();
+  /// If this operand's user has a borrowed value result return a valid
+  /// BorrowedValue instance.
+  BorrowedValue getBorrowIntroducingUserResult() const;
 
   /// Return the borrowing operand's value.
   SILValue getScopeIntroducingUserResult();

lib/SIL/Utils/OwnershipUtils.cpp

@@ -693,59 +693,34 @@ bool BorrowingOperand::visitExtendedScopeEndingUses(
     function_ref<bool(Operand *)> visitor) const {
 
   if (hasBorrowIntroducingUser()) {
-    return visitBorrowIntroducingUserResults(
-        [visitor](BorrowedValue borrowedValue) {
-          return borrowedValue.visitExtendedScopeEndingUses(visitor);
-        });
+    auto borrowedValue = getBorrowIntroducingUserResult();
+    return borrowedValue.visitExtendedScopeEndingUses(visitor);
   }
   return visitScopeEndingUses(visitor);
 }
 
-bool BorrowingOperand::visitBorrowIntroducingUserResults(
-    function_ref<bool(BorrowedValue)> visitor) const {
+BorrowedValue BorrowingOperand::getBorrowIntroducingUserResult() const {
   switch (kind) {
   case BorrowingOperandKind::Invalid:
-    llvm_unreachable("Using invalid case");
   case BorrowingOperandKind::Apply:
   case BorrowingOperandKind::TryApply:
   case BorrowingOperandKind::BeginApply:
   case BorrowingOperandKind::Yield:
   case BorrowingOperandKind::PartialApplyStack:
   case BorrowingOperandKind::BeginAsyncLet:
-    llvm_unreachable("Never has borrow introducer results!");
+    return BorrowedValue();
+
   case BorrowingOperandKind::BeginBorrow: {
     auto value = BorrowedValue(cast<BeginBorrowInst>(op->getUser()));
     assert(value);
-    return visitor(value);
+    return value;
   }
   case BorrowingOperandKind::Branch: {
     auto *bi = cast<BranchInst>(op->getUser());
-    auto value = BorrowedValue(
-        bi->getDestBB()->getArgument(op->getOperandNumber()));
+    auto value =
+        BorrowedValue(bi->getDestBB()->getArgument(op->getOperandNumber()));
     assert(value && "guaranteed-to-unowned conversion not allowed on branches");
-    return visitor(value);
-  }
-  }
-  llvm_unreachable("Covered switch isn't covered?!");
-}
-
-BorrowedValue BorrowingOperand::getBorrowIntroducingUserResult() {
-  switch (kind) {
-  case BorrowingOperandKind::Invalid:
-  case BorrowingOperandKind::Apply:
-  case BorrowingOperandKind::TryApply:
-  case BorrowingOperandKind::BeginApply:
-  case BorrowingOperandKind::Yield:
-  case BorrowingOperandKind::PartialApplyStack:
-  case BorrowingOperandKind::BeginAsyncLet:
-    return BorrowedValue();
-
-  case BorrowingOperandKind::BeginBorrow:
-    return BorrowedValue(cast<BeginBorrowInst>(op->getUser()));
-
-  case BorrowingOperandKind::Branch: {
-    auto *bi = cast<BranchInst>(op->getUser());
-    return BorrowedValue(bi->getDestBB()->getArgument(op->getOperandNumber()));
+    return value;
   }
   }
   llvm_unreachable("covered switch");
@@ -919,11 +894,9 @@ bool BorrowedValue::visitExtendedScopeEndingUses(
 
   auto visitEnd = [&](Operand *scopeEndingUse) {
     if (scopeEndingUse->getOperandOwnership() == OperandOwnership::Reborrow) {
-      BorrowingOperand(scopeEndingUse).visitBorrowIntroducingUserResults(
-        [&](BorrowedValue borrowedValue) {
-          reborrows.insert(borrowedValue.value);
-          return true;
-        });
+      auto borrowedValue =
+          BorrowingOperand(scopeEndingUse).getBorrowIntroducingUserResult();
+      reborrows.insert(borrowedValue.value);
       return true;
     }
     return visitor(scopeEndingUse);
@@ -948,11 +921,9 @@ bool BorrowedValue::visitTransitiveLifetimeEndingUses(
 
   auto visitEnd = [&](Operand *scopeEndingUse) {
     if (scopeEndingUse->getOperandOwnership() == OperandOwnership::Reborrow) {
-      BorrowingOperand(scopeEndingUse)
-          .visitBorrowIntroducingUserResults([&](BorrowedValue borrowedValue) {
-            reborrows.insert(borrowedValue.value);
-            return true;
-          });
+      auto borrowedValue =
+          BorrowingOperand(scopeEndingUse).getBorrowIntroducingUserResult();
+      reborrows.insert(borrowedValue.value);
       // visitor on the reborrow
       return visitor(scopeEndingUse);
     }
@@ -1003,16 +974,14 @@ bool BorrowedValue::visitInteriorPointerOperandHelper(
         break;
       }
 
-      borrowingOperand.visitBorrowIntroducingUserResults([&](auto bv) {
-        for (auto *use : bv->getUses()) {
-          if (auto intPtrOperand = InteriorPointerOperand(use)) {
-            func(intPtrOperand);
-            continue;
-          }
-          worklist.push_back(use);
+      auto bv = borrowingOperand.getBorrowIntroducingUserResult();
+      for (auto *use : bv->getUses()) {
+        if (auto intPtrOperand = InteriorPointerOperand(use)) {
+          func(intPtrOperand);
+          continue;
         }
-        return true;
-      });
+        worklist.push_back(use);
+      }
       continue;
     }
 

lib/SILOptimizer/SILCombiner/SILCombinerBuiltinVisitors.cpp

@@ -118,10 +118,8 @@ SILCombiner::optimizeBuiltinCOWBufferForReadingOSSA(BuiltinInst *bi) {
     if (auto operand = BorrowingOperand(use)) {
       if (operand.isReborrow())
         return nullptr;
-      operand.visitBorrowIntroducingUserResults([&](BorrowedValue bv) {
-        accumulatedBorrowedValues.push_back(bv);
-        return true;
-      });
+      auto bv = operand.getBorrowIntroducingUserResult();
+      accumulatedBorrowedValues.push_back(bv);
       continue;
     }