Rename areUsesWithinLocalScope -> areUsesWithinTransitiveScope

Author: meg-gupta

include/swift/SIL/OwnershipUtils.h

@@ -578,8 +578,8 @@ struct BorrowedValue {
   ///
   /// \p deadEndBlocks is optional during transition. It will be completely
   /// removed in an upcoming commit.
-  bool areUsesWithinLocalScope(ArrayRef<Operand *> uses,
-                               DeadEndBlocks *deadEndBlocks) const;
+  bool areUsesWithinTransitiveScope(ArrayRef<Operand *> uses,
+                                    DeadEndBlocks *deadEndBlocks) const;
 
   /// Given a local borrow scope introducer, visit all non-forwarding consuming
   /// users. This means that this looks through guaranteed block arguments. \p

lib/SIL/Utils/OwnershipUtils.cpp

@@ -695,7 +695,7 @@ void BorrowedValue::computeLiveness(PrunedLiveness &liveness) const {
   });
 }
 
-bool BorrowedValue::areUsesWithinLocalScope(
+bool BorrowedValue::areUsesWithinTransitiveScope(
     ArrayRef<Operand *> uses, DeadEndBlocks *deadEndBlocks) const {
   // First make sure that we actually have a local scope. If we have a non-local
   // scope, then we have something (like a SILFunctionArgument) where a larger
@@ -975,7 +975,7 @@ bool AddressOwnership::areUsesWithinLifetime(
   SILValue root = base.getOwnershipReferenceRoot();
   BorrowedValue borrow(root);
   if (borrow)
-    return borrow.areUsesWithinLocalScope(uses, &deadEndBlocks);
+    return borrow.areUsesWithinTransitiveScope(uses, &deadEndBlocks);
 
   // --- A reference no borrow scope. Currently happens for project_box.
 

lib/SILOptimizer/SemanticARC/CopyValueOpts.cpp

@@ -155,8 +155,8 @@ bool SemanticARCOptVisitor::performGuaranteedCopyValueOptimization(
   // TODO: There may be some way of sinking this into the loop below.
   //
   // FIXME: The haveAnyLocalScopes and destroy.empty() checks are relics of
-  // attempts to handle dead end blocks during areUsesWithinLocalScope. If we
-  // don't use dead end blocks at all, they should not be relevant.
+  // attempts to handle dead end blocks during areUsesWithinTransitiveScope. If
+  // we don't use dead end blocks at all, they should not be relevant.
   bool haveAnyLocalScopes =
       llvm::any_of(borrowScopeIntroducers, [](BorrowedValue borrowScope) {
         return borrowScope.isLocalScope();
@@ -182,15 +182,15 @@ bool SemanticARCOptVisitor::performGuaranteedCopyValueOptimization(
   //    need to insert an end_borrow since all of our borrow introducers are
   //    non-local scopes.
   //
-  // The call to areUsesWithinLocalScope cannot consider dead-end blocks. A
+  // The call to areUsesWithinTransitiveScope cannot consider dead-end blocks. A
   // local borrow scope requires all its inner uses to be inside the borrow
   // scope, regardless of whether the end of the scope is inside a dead-end
   // block.
   {
     SmallVector<Operand *, 8> scratchSpace;
     if (llvm::any_of(borrowScopeIntroducers, [&](BorrowedValue borrowScope) {
-      return !borrowScope.areUsesWithinLocalScope(lr.getAllConsumingUses(),
-                                                  nullptr);
+          return !borrowScope.areUsesWithinTransitiveScope(
+              lr.getAllConsumingUses(), nullptr);
         })) {
       return false;
     }
@@ -218,7 +218,7 @@ bool SemanticARCOptVisitor::performGuaranteedCopyValueOptimization(
       }
 
       if (llvm::any_of(borrowScopeIntroducers, [&](BorrowedValue borrowScope) {
-            return !borrowScope.areUsesWithinLocalScope(
+            return !borrowScope.areUsesWithinTransitiveScope(
                 phiArgLR.getAllConsumingUses(), nullptr);
           })) {
         return false;