Rename ForwardingOperand.getOwnershipKind()

to getForwardingOwnershipKind() just to distinguish it from
SILValue.getOwnershipKind() and be able to grep for them each.

Author: atrick

include/swift/SIL/OwnershipUtils.h

@@ -172,8 +172,8 @@ class ForwardingOperand {
     return use->getOwnershipConstraint();
   }
 
-  ValueOwnershipKind getOwnershipKind() const;
-  void setOwnershipKind(ValueOwnershipKind newKind) const;
+  ValueOwnershipKind getForwardingOwnershipKind() const;
+  void setForwardingOwnershipKind(ValueOwnershipKind newKind) const;
   void replaceOwnershipKind(ValueOwnershipKind oldKind,
                             ValueOwnershipKind newKind) const;
 

lib/SIL/Utils/OwnershipUtils.cpp

@@ -1124,7 +1124,7 @@ ForwardingOperand::ForwardingOperand(Operand *use) {
   this->use = use;
 }
 
-ValueOwnershipKind ForwardingOperand::getOwnershipKind() const {
+ValueOwnershipKind ForwardingOperand::getForwardingOwnershipKind() const {
   auto *user = use->getUser();
 
   // NOTE: This if chain is meant to be a covered switch, so make sure to return
@@ -1156,7 +1156,8 @@ ValueOwnershipKind ForwardingOperand::getOwnershipKind() const {
   llvm_unreachable("Unhandled forwarding inst?!");
 }
 
-void ForwardingOperand::setOwnershipKind(ValueOwnershipKind newKind) const {
+void ForwardingOperand::setForwardingOwnershipKind(
+    ValueOwnershipKind newKind) const {
   auto *user = use->getUser();
   // NOTE: This if chain is meant to be a covered switch, so make sure to return
   // in each if itself since we have an unreachable at the bottom to ensure if a

lib/SILOptimizer/Utils/CanonicalizeBorrowScope.cpp

@@ -455,7 +455,8 @@ class RewriteInnerBorrowUses {
     // Update this operand bypassing any copies.
     SILValue value = use->get();
     use->set(scope.findDefInBorrowScope(value));
-    ForwardingOperand(use).setOwnershipKind(OwnershipKind::Guaranteed);
+    ForwardingOperand(use).setForwardingOwnershipKind(
+        OwnershipKind::Guaranteed);
     deleteCopyChain(value, scope.getDeleter());
     return true;
   }
@@ -570,7 +571,8 @@ class RewriteOuterBorrowUses {
       LLVM_DEBUG(llvm::dbgs() << "  Deleted " << *user);
     } else {
       use->set(scope.findDefInBorrowScope(use->get()));
-      ForwardingOperand(use).setOwnershipKind(OwnershipKind::Guaranteed);
+      ForwardingOperand(use).setForwardingOwnershipKind(
+          OwnershipKind::Guaranteed);
     }
     deleteCopyChain(innerValue, scope.getDeleter());
     return true;
@@ -659,7 +661,7 @@ SILValue RewriteOuterBorrowUses::createOuterValues(SILValue innerValue) {
   scope.getCallbacks().createdNewInst(clone);
   Operand *use = &clone->getOperandRef(0);
   use->set(incomingOuterVal);
-  ForwardingOperand(use).setOwnershipKind(OwnershipKind::Owned);
+  ForwardingOperand(use).setForwardingOwnershipKind(OwnershipKind::Owned);
 
   LLVM_DEBUG(llvm::dbgs() << "  Hoisted forward " << *clone);