[Diagnostics] NFC: Rename OverloadCandidate::getUncurried{Function}Type -> OverloadCandidate::get{Function}Type

Author: xedin

lib/Sema/CSDiag.cpp

@@ -5126,7 +5126,7 @@ bool FailureDiagnosis::diagnoseSubscriptMisuse(ApplyExpr *callExpr) {
   using ClosenessPair = CalleeCandidateInfo::ClosenessResultTy;
 
   candidateInfo.filterList([&](OverloadCandidate cand) -> ClosenessPair {
-    auto candFuncType = cand.getUncurriedFunctionType();
+    auto candFuncType = cand.getFunctionType();
     if (!candFuncType)
       return {CC_GeneralMismatch, {}};
 
@@ -5679,7 +5679,7 @@ bool FailureDiagnosis::visitApplyExpr(ApplyExpr *callExpr) {
           return false;
 
         auto candidate = calleeInfo[0];
-        auto *fnType = candidate.getUncurriedFunctionType();
+        auto *fnType = candidate.getFunctionType();
         if (!fnType)
           return false;
 
@@ -7228,7 +7228,7 @@ bool FailureDiagnosis::visitUnresolvedMemberExpr(UnresolvedMemberExpr *E) {
       // expected result type.
       auto resultTy = candidateInfo[0].getResultType();
       if (!resultTy)
-        resultTy = candidateInfo[0].getUncurriedType();
+        resultTy = candidateInfo[0].getType();
 
       if (resultTy && !CS.getContextualType()->is<UnboundGenericType>() &&
           !CS.TC.isConvertibleTo(resultTy, CS.getContextualType(), CS.DC)) {

lib/Sema/CalleeCandidateInfo.cpp

@@ -143,8 +143,8 @@ void OverloadCandidate::dump() const {
     llvm::errs() << "<<EXPR>>";
   llvm::errs() << " - ignore curried self = " << (skipCurriedSelf ? "yes"
                                                                   : "no");
-  
-  if (auto FT = getUncurriedFunctionType())
+
+  if (auto FT = getFunctionType())
     llvm::errs() << " - type: " << Type(FT) << "\n";
   else
     llvm::errs() << " - type <<NONFUNCTION>>: " << entityType << "\n";

lib/Sema/CalleeCandidateInfo.h

@@ -81,8 +81,8 @@ namespace swift {
     Expr *getExpr() const {
       return declOrExpr.dyn_cast<Expr*>();
     }
-    
-    Type getUncurriedType() const {
+
+    Type getType() const {
       // Start with the known type of the decl.
       auto type = entityType;
       if (skipCurriedSelf) {
@@ -92,13 +92,13 @@ namespace swift {
       }
       return type;
     }
-    
-    AnyFunctionType *getUncurriedFunctionType() const {
-      if (auto type = getUncurriedType())
+
+    AnyFunctionType *getFunctionType() const {
+      if (auto type = getType())
         return type->getAs<AnyFunctionType>();
       return nullptr;
     }
-    
+
     /// Given a function candidate with an uncurry level, return the parameter
     /// type at the specified uncurry level.  If there is an error getting to
     /// the specified input, this returns a null Type.
@@ -110,20 +110,18 @@ namespace swift {
       return FunctionType::composeInput(ctx, params, false);
     }
 
-    bool hasParameters() const {
-      return getUncurriedFunctionType();
-    }
+    bool hasParameters() const { return getFunctionType(); }
 
     ArrayRef<AnyFunctionType::Param> getParameters() const {
       assert(hasParameters());
-      return getUncurriedFunctionType()->getParams();
+      return getFunctionType()->getParams();
     }
 
     /// Given a function candidate with an uncurry level, return the parameter
     /// type at the specified uncurry level.  If there is an error getting to
     /// the specified input, this returns a null Type.
     Type getResultType() const {
-      if (auto *funcTy = getUncurriedFunctionType())
+      if (auto *funcTy = getFunctionType())
         return funcTy->getResult();
       return Type();
     }