Merge pull request #29519 from gottesmm/pr-a38b5f72b7fe7f2e4482b0456b6e1cb080ec9540

Author: swift-ci

include/swift/SIL/BranchPropagatedUser.h

@@ -108,6 +108,18 @@ class BranchPropagatedUser {
         llvm::PointerLikeTypeTraits<InnerTy>::NumLowBitsAvailable
   };
 
+  static ArrayRef<BranchPropagatedUser>
+  convertFromInstArray(ArrayRef<SILInstruction *> instArray) {
+    assert(llvm::all_of(
+               instArray,
+               [](SILInstruction *i) { return !isa<CondBranchInst>(i); }) &&
+           "Passed cond branch to a non-BranchPropagatedUser API");
+    auto *castData =
+        reinterpret_cast<const BranchPropagatedUser *>(instArray.data());
+    ArrayRef<BranchPropagatedUser> castArray(castData, instArray.size());
+    return castArray;
+  }
+
 private:
   BranchPropagatedUser(SILInstruction *inst) : user(inst) {
     assert(!isa<CondBranchInst>(inst));

include/swift/SIL/OwnershipUtils.h

@@ -187,24 +187,9 @@ class LinearLifetimeChecker {
   bool validateLifetime(SILValue value,
                         ArrayRef<SILInstruction *> consumingUses,
                         ArrayRef<SILInstruction *> nonConsumingUses) {
-    assert(llvm::all_of(
-               consumingUses,
-               [](SILInstruction *i) { return !isa<CondBranchInst>(i); }) &&
-           "Passed cond branch to a non-BranchPropagatedUser API");
-    assert(llvm::all_of(
-               nonConsumingUses,
-               [](SILInstruction *i) { return !isa<CondBranchInst>(i); }) &&
-           "Passed cond branch to a non-BranchPropagatedUser API");
-    auto *consumingUsesCast =
-        reinterpret_cast<const BranchPropagatedUser *>(consumingUses.data());
-    auto *nonConsumingUsesCast =
-        reinterpret_cast<const BranchPropagatedUser *>(nonConsumingUses.data());
-    ArrayRef<BranchPropagatedUser> consumingUsesCastArray(consumingUsesCast,
-                                                          consumingUses.size());
-    ArrayRef<BranchPropagatedUser> nonConsumingUsesCastArray(
-        nonConsumingUsesCast, nonConsumingUses.size());
-    return validateLifetime(value, consumingUsesCastArray,
-                            nonConsumingUsesCastArray);
+    return validateLifetime(
+        value, BranchPropagatedUser::convertFromInstArray(consumingUses),
+        BranchPropagatedUser::convertFromInstArray(nonConsumingUses));
   }
 };