[NFC] hasGuaranteedAddressResults -> hasGuaranteedAddressResult and hasGuaranteedResults -> hasGuaranteedResult

Author: meg-gupta

include/swift/AST/Types.h

@@ -5396,7 +5396,7 @@ class SILFunctionType final
     return hasErrorResult() && getErrorResult().isFormalIndirect();
   }
 
-  bool hasGuaranteedAddressResults() const {
+  bool hasGuaranteedAddressResult() const {
     for (auto &result : getResults()) {
       if (result.isGuaranteedAddressResult()) {
         return true;

include/swift/SIL/MemAccessUtils.h

@@ -169,7 +169,7 @@ inline bool isGuaranteedAddressReturn(SILValue value) {
   if (!defInst) {
     return false;
   }
-  return defInst->getSubstCalleeConv().hasGuaranteedAddressResults();
+  return defInst->getSubstCalleeConv().hasGuaranteedAddressResult();
 }
 
 /// Return the source address after stripping as many access projections as

include/swift/SIL/SILFunctionConventions.h

@@ -298,7 +298,7 @@ class SILFunctionConventions {
         IndirectSILResultFilter(silConv.loweredAddresses));
   }
 
-  bool hasGuaranteedResults() const {
+  bool hasGuaranteedResult() const {
     for (auto result : funcTy->getResults()) {
       if (result.getConvention() == ResultConvention::Guaranteed) {
         return true;
@@ -307,7 +307,7 @@ class SILFunctionConventions {
     return false;
   }
 
-  bool hasGuaranteedAddressResults() const {
+  bool hasGuaranteedAddressResult() const {
     for (auto result : funcTy->getResults()) {
       if (result.getConvention() == ResultConvention::GuaranteedAddress) {
         return true;

include/swift/SIL/SILInstruction.h

@@ -3150,7 +3150,7 @@ class ApplyInst final
 
 public:
   bool hasGuaranteedResult() const {
-      return getSubstCalleeConv().hasGuaranteedResults();
+      return getSubstCalleeConv().hasGuaranteedResult();
   }
 };
 

lib/SIL/IR/SILFunctionType.cpp

@@ -180,7 +180,7 @@ SILFunctionType::getDirectFormalResultsType(SILModule &M,
                                             TypeExpansionContext context) {
   CanType type;
 
-  if (hasGuaranteedAddressResults()) {
+  if (hasGuaranteedAddressResult()) {
     assert(getNumDirectFormalResults() == 1);
       return SILType::getPrimitiveAddressType(
           getSingleDirectFormalResult().getReturnValueType(M, this, context));

lib/SILGen/SILGenEpilog.cpp

@@ -33,12 +33,11 @@ void SILGenFunction::prepareEpilog(
     // emits unreachable if there is no source level return.
     NeedsReturn = !(*directResultType)->isEqual(TupleType::getEmpty(getASTContext()));
     if (NeedsReturn) {
-      if (fnConv.hasGuaranteedAddressResults() ||
-           fnConv.hasGuaranteedResults()) {
+      if (fnConv.hasGuaranteedAddressResult() || fnConv.hasGuaranteedResult()) {
         // Do not explode tuples for borrow/mutate accessors
         SILType resultType =
             F.getLoweredType(F.mapTypeIntoContext(*directResultType));
-        epilogBB->createPhiArgument(resultType, fnConv.hasGuaranteedResults()
+        epilogBB->createPhiArgument(resultType, fnConv.hasGuaranteedResult()
                                                     ? OwnershipKind::Guaranteed
                                                     : OwnershipKind::None);
       } else {
@@ -64,9 +63,9 @@ void SILGenFunction::prepareEpilog(
                 worklist.push_back(ty.getTupleElementType(index));
               }
             } else {
-              if (fnConv.hasGuaranteedResults()) {
+              if (fnConv.hasGuaranteedResult()) {
                 epilogBB->createPhiArgument(ty, OwnershipKind::Guaranteed);
-              } else if (fnConv.hasGuaranteedAddressResults()) {
+              } else if (fnConv.hasGuaranteedAddressResult()) {
                 epilogBB->createPhiArgument(ty, OwnershipKind::None);
               } else {
                 epilogBB->createPhiArgument(ty, OwnershipKind::Owned);

lib/SILGen/SILGenStmt.cpp

@@ -735,8 +735,8 @@ void SILGenFunction::emitReturnExpr(SILLocation branchLoc,
     for (auto cleanup : resultCleanups) {
       Cleanups.forwardCleanup(cleanup);
     }
-  } else if (F.getConventions().hasGuaranteedResults() ||
-             F.getConventions().hasGuaranteedAddressResults()) {
+  } else if (F.getConventions().hasGuaranteedResult() ||
+             F.getConventions().hasGuaranteedAddressResult()) {
     // If the return expression is a literal, emit as a regular return
     // expression/
     if (isa<LiteralExpr>(ret)) {
@@ -769,7 +769,7 @@ void SILGenFunction::emitReturnExpr(SILLocation branchLoc,
       // Emit return value at +0.
       LValueOptions options;
       auto lvalue = emitLValue(ret,
-                               F.getConventions().hasGuaranteedResults()
+                               F.getConventions().hasGuaranteedResult()
                                    ? SGFAccessKind::BorrowedObjectRead
                                    : SGFAccessKind::BorrowedAddressRead,
                                options.withBorrow(true));
@@ -785,7 +785,7 @@ void SILGenFunction::emitReturnExpr(SILLocation branchLoc,
       // Address type phis are banned in SIL.
       // For now diagnose multiple return statements in such cases.
       // TODO: Support multiple epilog blocks in SILGen and SILOptimizer.
-      if (F.getConventions().hasGuaranteedAddressResults() &&
+      if (F.getConventions().hasGuaranteedAddressResult() &&
           !ReturnDest.getBlock()->getPredecessorBlocks().empty()) {
         diagnose(getASTContext(), ret->getStartLoc(),
                  diag::invalid_multiple_return_borrow_accessor);

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.cpp

@@ -1115,7 +1115,7 @@ addressBeginsInitialized(MarkUnresolvedNonCopyableValueInst *address) {
 
   if (auto *applyInst = dyn_cast_or_null<ApplyInst>(
           stripAccessMarkers(operand)->getDefiningInstruction())) {
-    if (applyInst->getSubstCalleeConv().hasGuaranteedAddressResults()) {
+    if (applyInst->getSubstCalleeConv().hasGuaranteedAddressResult()) {
       LLVM_DEBUG(llvm::dbgs() << "Adding apply as init!\n");
       return true;
     }

lib/SILOptimizer/Transforms/GenericSpecializer.cpp

@@ -112,7 +112,8 @@ bool swift::specializeAppliesInFunction(SILFunction &F,
       // temporary stack location and returns a projection from the
       // store_borrow. This does not work for borrow accessors that return the
       // projection from within the store_borrow scope.
-      if (F.hasOwnership() && Callee->getConventions().hasGuaranteedAddressResults()) {
+      if (F.hasOwnership() &&
+          Callee->getConventions().hasGuaranteedAddressResult()) {
         continue;
       }