Rename areUsesWithinTransitiveScope to ...ExtendedScope

Start using consistent terminolfy in ownership utils.

A transitive use set follows transitive uses within an ownership
lifetime. It does not rely on complete inner scopes. An extended use
set is not necessarilly transitive but does look across
lifetime-ending uses: copies of owned values and/or reborrows of
guaranteed values. Whether lifetime extension refers to copies or
reborrow is context dependent.

Author: atrick

include/swift/SIL/OwnershipUtils.h

@@ -582,8 +582,8 @@ struct BorrowedValue {
   ///
   /// \p deadEndBlocks is optional during transition. It will be completely
   /// removed in an upcoming commit.
-  bool areUsesWithinTransitiveScope(ArrayRef<Operand *> uses,
-                                    DeadEndBlocks *deadEndBlocks) const;
+  bool areUsesWithinExtendedScope(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

@@ -769,7 +769,7 @@ computeTransitiveLiveness(MultiDefPrunedLiveness &liveness) const {
   });
 }
 
-bool BorrowedValue::areUsesWithinTransitiveScope(
+bool BorrowedValue::areUsesWithinExtendedScope(
     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
@@ -1087,7 +1087,7 @@ bool AddressOwnership::areUsesWithinLifetime(
   SILValue root = base.getOwnershipReferenceRoot();
   BorrowedValue borrow(root);
   if (borrow)
-    return borrow.areUsesWithinTransitiveScope(uses, &deadEndBlocks);
+    return borrow.areUsesWithinExtendedTransitiveScope(uses, &deadEndBlocks);
 
   // --- A reference with no borrow scope! Currently happens for project_box.
 

lib/SILOptimizer/SemanticARC/CopyValueOpts.cpp

@@ -155,7 +155,7 @@ 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 areUsesWithinTransitiveScope. If
+  // attempts to handle dead end blocks during areUsesWithinExtendedScope. If
   // we don't use dead end blocks at all, they should not be relevant.
   bool haveAnyLocalScopes =
       llvm::any_of(borrowScopeIntroducers, [](BorrowedValue borrowScope) {
@@ -182,13 +182,13 @@ bool SemanticARCOptVisitor::performGuaranteedCopyValueOptimization(
   //    need to insert an end_borrow since all of our borrow introducers are
   //    non-local scopes.
   //
-  // The call to areUsesWithinTransitiveScope cannot consider dead-end blocks. A
+  // The call to areUsesWithinExtendedScope 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.
   {
     if (llvm::any_of(borrowScopeIntroducers, [&](BorrowedValue borrowScope) {
-          return !borrowScope.areUsesWithinTransitiveScope(
+          return !borrowScope.areUsesWithinExtendedScope(
               lr.getAllConsumingUses(), nullptr);
         })) {
       return false;
@@ -217,7 +217,7 @@ bool SemanticARCOptVisitor::performGuaranteedCopyValueOptimization(
       }
 
       if (llvm::any_of(borrowScopeIntroducers, [&](BorrowedValue borrowScope) {
-            return !borrowScope.areUsesWithinTransitiveScope(
+            return !borrowScope.areUsesWithinExtendedScope(
                 phiArgLR.getAllConsumingUses(), nullptr);
           })) {
         return false;