[NFC] Rename LVOptions::withBorrow -> LVOptions::forGuaranteedReturn

Also add forGuaranteedAddressReturn

Author: meg-gupta

lib/SILGen/SILGenFunction.h

@@ -58,7 +58,8 @@ class ExecutorBreadcrumb;
 struct LValueOptions {
   bool IsNonAccessing = false;
   bool TryAddressable = false;
-  bool NeedsBorrow = false;
+  bool ForGuaranteedReturn = false;
+  bool ForGuaranteedAddressReturn = false;
 
   /// Derive options for accessing the base of an l-value, given that
   /// applying the derived component might touch the memory.
@@ -83,9 +84,15 @@ struct LValueOptions {
     return copy;
   }
 
-  LValueOptions withBorrow(bool borrow) const {
+  LValueOptions forGuaranteedReturn(bool value) const {
     auto copy = *this;
-    copy.NeedsBorrow = borrow;
+    copy.ForGuaranteedReturn = value;
+    return copy;
+  }
+
+  LValueOptions forGuaranteedAddressReturn(bool value) const {
+    auto copy = *this;
+    copy.ForGuaranteedAddressReturn = value;
     return copy;
   }
 };

lib/SILGen/SILGenLValue.cpp

@@ -3053,11 +3053,16 @@ class LLVM_LIBRARY_VISIBILITY SILGenBorrowedBaseVisitor
   SILGenLValue &SGL;
   SILGenFunction &SGF;
   AbstractionPattern Orig;
+  bool forGuaranteedReturn;
+  bool forGuaranteedAddressReturn;
 
-  SILGenBorrowedBaseVisitor(SILGenLValue &SGL,
-                            SILGenFunction &SGF,
-                            AbstractionPattern Orig)
-      : SGL(SGL), SGF(SGF), Orig(Orig) {}
+  SILGenBorrowedBaseVisitor(SILGenLValue &SGL, SILGenFunction &SGF,
+                            AbstractionPattern Orig,
+                            bool forGuaranteedReturn = false,
+                            bool forGuaranteedAddressReturn = false)
+      : SGL(SGL), SGF(SGF), Orig(Orig),
+        forGuaranteedReturn(forGuaranteedReturn),
+        forGuaranteedAddressReturn(forGuaranteedAddressReturn) {}
 
   static bool isNonCopyableBaseBorrow(SILGenFunction &SGF, Expr *e) {
     if (auto *m = dyn_cast<MemberRefExpr>(e)) {
@@ -3261,8 +3266,9 @@ LValue SILGenLValue::visitRec(Expr *e, SGFAccessKind accessKind,
   // apply the lvalue within a formal access to the original value instead of
   // an actual loaded copy.
   if (SILGenBorrowedBaseVisitor::isNonCopyableBaseBorrow(SGF, e) ||
-      options.NeedsBorrow) {
-    SILGenBorrowedBaseVisitor visitor(*this, SGF, orig);
+      options.ForGuaranteedReturn) {
+    SILGenBorrowedBaseVisitor visitor(*this, SGF, orig,
+                                      options.ForGuaranteedReturn);
     auto accessKind = SGFAccessKind::BorrowedObjectRead;
     assert(!e->getType()->is<LValueType>()
         && "maybe need SGFAccessKind::BorrowedAddressRead ?");

lib/SILGen/SILGenStmt.cpp

@@ -772,7 +772,7 @@ void SILGenFunction::emitReturnExpr(SILLocation branchLoc,
                                F.getConventions().hasGuaranteedResult()
                                    ? SGFAccessKind::BorrowedObjectRead
                                    : SGFAccessKind::BorrowedAddressRead,
-                               options.withBorrow(true));
+                               options.forGuaranteedReturn(true));
       auto result =
           tryEmitProjectedLValue(ret, std::move(lvalue), TSanKind::None);
       if (!result) {