Update VariableNameInferrer for borrow/mutate accessors

Author: meg-gupta

lib/SIL/IR/SILValue.cpp

@@ -210,7 +210,7 @@ bool ValueBase::isBorrowAccessorResult() const {
   auto *apply = dyn_cast_or_null<ApplyInst>(getDefiningInstruction());
   if (!apply)
     return false;
-  return apply->hasGuaranteedResult();
+  return apply->hasGuaranteedResult() || apply->hasGuaranteedAddressResult();
 }
 
 bool ValueBase::hasDebugTrace() const {

lib/SILOptimizer/Utils/VariableNameUtils.cpp

@@ -599,6 +599,17 @@ SILValue VariableNameInferrer::findDebugInfoProvidingValueHelper(
       }
     }
 
+    // Borrow/mutate accessor
+    if (searchValue->isBorrowAccessorResult()) {
+      if (auto fas =
+              FullApplySite::isa(searchValue->getDefiningInstruction())) {
+        if (auto selfParam = getNamePathComponentFromCallee(fas)) {
+          searchValue = selfParam;
+          continue;
+        }
+      }
+    }
+
     // Addressor accessor.
     if (auto ptrToAddr =
             dyn_cast<PointerToAddressInst>(stripAccessMarkers(searchValue))) {