Clarify method names in SolutionApplicationTarget.

Author: DougGregor

lib/Sema/CSApply.cpp

@@ -7320,7 +7320,7 @@ Optional<SolutionApplicationTarget> ConstraintSystem::applySolution(
     // We are supposed to use contextual type only if it is present and
     // this expression doesn't represent the implicit return of the single
     // expression function which got deduced to be `Never`.
-    Type convertType = target.getExprConversionTypeForConstraint();
+    Type convertType = target.getExprConversionType();
     auto shouldCoerceToContextualType = [&]() {
       return convertType &&
           !target.isOptionalSomePatternInit() &&

lib/Sema/CSSolver.cpp

@@ -1259,7 +1259,7 @@ ConstraintSystem::solveImpl(SolutionApplicationTarget &target,
 
   // If there is a type that we're expected to convert to, add the conversion
   // constraint.
-  if (Type convertType = target.getExprConversionTypeForConstraint()) {
+  if (Type convertType = target.getExprConversionType()) {
     // Determine whether we know more about the contextual type.
     ContextualTypePurpose ctp = target.getExprContextualTypePurpose();
     bool isOpaqueReturnType = target.infersOpaqueReturnType();

lib/Sema/ConstraintSystem.h

@@ -1224,11 +1224,11 @@ class SolutionApplicationTarget {
     return expression.contextualPurpose;
   }
 
-  Type getExprConversionType() const {
-    return getExprConversionTypeLoc().getType();
+  Type getExprContextualType() const {
+    return getExprContextualTypeLoc().getType();
   }
 
-  TypeLoc getExprConversionTypeLoc() const {
+  TypeLoc getExprContextualTypeLoc() const {
     assert(kind == Kind::expression);
 
     // For an @autoclosure parameter, the conversion type is
@@ -1241,10 +1241,12 @@ class SolutionApplicationTarget {
     return expression.convertType;
   }
 
-  Type getExprConversionTypeForConstraint() const {
+  /// Retrieve the type to which an expression should be converted, or
+  /// a NULL type if no conversion constraint should be generated.
+  Type getExprConversionType() const {
     if (contextualTypeIsOnlyAHint())
       return Type();
-    return getExprConversionType();
+    return getExprContextualType();
   }
 
   /// Returns the autoclosure parameter type, or \c nullptr if the

lib/Sema/TypeCheckConstraints.cpp

@@ -2133,7 +2133,7 @@ TypeChecker::typeCheckExpression(
     contextualTypeExpr = loadExpr->getSubExpr();
   cs.setContextualType(
       contextualTypeExpr,
-      target.getExprConversionTypeLoc(),
+      target.getExprContextualTypeLoc(),
       target.getExprContextualTypePurpose(),
       target.infersOpaqueReturnType());
 
@@ -2147,7 +2147,8 @@ TypeChecker::typeCheckExpression(
   // type variable and update the target's type with an optional of that
   // type variable.
   if (target.isOptionalSomePatternInit()) {
-    assert(!target.getExprConversionType() && "convertType and type check options conflict");
+    assert(!target.getExprContextualType() &&
+           "some pattern cannot have contextual type pre-configured");
     auto *convertTypeLocator =
         cs.getConstraintLocator(expr, LocatorPathElt::ContextualType());
     Type var = cs.createTypeVariable(convertTypeLocator, TVO_CanBindToNoEscape);
@@ -2166,8 +2167,8 @@ TypeChecker::typeCheckExpression(
   // because they will leak out into arbitrary places in the resultant AST.
   if (options.contains(TypeCheckExprFlags::AllowUnresolvedTypeVariables) &&
        (viable->size() != 1 ||
-        (target.getExprConversionTypeForConstraint() &&
-         target.getExprConversionTypeForConstraint()->hasUnresolvedType()))) {
+        (target.getExprConversionType() &&
+         target.getExprConversionType()->hasUnresolvedType()))) {
     // FIXME: This hack should only be needed for CSDiag.
     unresolvedTypeExprs = true;
     return target;