Merge pull request swiftlang#23748 from gottesmm/pr-f44e277b4644313c441523f68d8c2928247e1e26

Author: swift-ci

include/swift/SIL/OwnershipUtils.h

@@ -14,6 +14,8 @@
 #define SWIFT_SIL_OWNERSHIPUTILS_H
 
 #include "swift/Basic/LLVM.h"
+#include "swift/SIL/SILArgument.h"
+#include "swift/SIL/SILInstruction.h"
 #include "swift/SIL/SILValue.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallVector.h"
@@ -124,6 +126,27 @@ class LinearLifetimeError {
   }
 };
 
+struct UseToEndBorrow {
+  Optional<EndBorrowInst *> operator()(Operand *use) const {
+    if (auto *ebi = dyn_cast<EndBorrowInst>(use->getUser())) {
+      return ebi;
+    }
+    return None;
+  }
+};
+
+using EndBorrowRange =
+    OptionalTransformRange<ValueBase::use_range, UseToEndBorrow,
+                           ValueBase::use_iterator>;
+
+/// Given a value \p v that is a "borrow" introducer, return its associated
+/// end_borrow users.
+inline auto makeEndBorrowRange(SILValue v) -> EndBorrowRange {
+  assert((isa<BeginBorrowInst>(v) || isa<LoadBorrowInst>(v)) &&
+         "Unhandled borrow introducer");
+  return EndBorrowRange(v->getUses(), UseToEndBorrow());
+}
+
 /// Returns true if:
 ///
 /// 1. No consuming uses are reachable from any other consuming use, from any

include/swift/SIL/SILInstruction.h

@@ -3255,32 +3255,8 @@ class BeginBorrowInst
   BeginBorrowInst(SILDebugLocation DebugLoc, SILValue LValue)
       : UnaryInstructionBase(DebugLoc, LValue,
                              LValue->getType().getObjectType()) {}
-
-private:
-  /// Predicate used to filer EndBorrowRange.
-  struct UseToEndBorrow;
-
-public:
-  using EndBorrowRange =
-      OptionalTransformRange<use_range, UseToEndBorrow, use_iterator>;
-
-  /// Find all associated end_borrow instructions for this begin_borrow.
-  EndBorrowRange getEndBorrows() const;
-};
-
-struct BeginBorrowInst::UseToEndBorrow {
-  Optional<EndBorrowInst *> operator()(Operand *use) const {
-    if (auto *ebi = dyn_cast<EndBorrowInst>(use->getUser())) {
-      return ebi;
-    }
-    return None;
-  }
 };
 
-inline auto BeginBorrowInst::getEndBorrows() const -> EndBorrowRange {
-  return EndBorrowRange(getUses(), UseToEndBorrow());
-}
-
 /// Represents a store of a borrowed value into an address. Returns the borrowed
 /// address. Must be paired with an end_borrow in its use-def list.
 class StoreBorrowInst

lib/SIL/SILOwnershipVerifier.cpp

@@ -331,7 +331,7 @@ bool SILValueOwnershipChecker::gatherUsers(
         for (unsigned i : indices(nonLifetimeEndingUsers)) {
           if (auto *bbi = dyn_cast<BeginBorrowInst>(
                   nonLifetimeEndingUsers[i].getInst())) {
-            copy(bbi->getEndBorrows(),
+            copy(makeEndBorrowRange(bbi),
                  std::back_inserter(implicitRegularUsers));
           }
         }