Make convertToType a utility

Author: CodaFi

lib/Sema/CSApply.cpp

@@ -3531,7 +3531,7 @@ namespace {
 
         solution.setExprTypes(sub);
 
-        if (cs.getTypeChecker().convertToType(sub, toType, cs.DC))
+        if (TypeChecker::convertToType(sub, toType, cs.DC))
           return nullptr;
 
         cs.cacheExprTypes(sub);

lib/Sema/CSGen.cpp

@@ -3626,7 +3626,7 @@ namespace {
       if (auto keyPath = dyn_cast<KeyPathExpr>(expr)) {
         if (keyPath->isObjC()) {
           auto &cs = CG.getConstraintSystem();
-          (void)cs.getTypeChecker().checkObjCKeyPathExpr(cs.DC, keyPath);
+          (void)TypeChecker::checkObjCKeyPathExpr(cs.DC, keyPath);
         }
       }
 

lib/Sema/TypeCheckConstraints.cpp

@@ -3451,7 +3451,8 @@ bool TypeChecker::convertToType(Expr *&expr, Type type, DeclContext *dc,
   cs.addConstraint(ConstraintKind::Conversion, expr->getType(), type,
                    cs.getConstraintLocator(expr));
 
-  if (getLangOpts().DebugConstraintSolver) {
+  auto &Context = dc->getASTContext();
+  if (Context.LangOpts.DebugConstraintSolver) {
     auto &log = Context.TypeCheckerDebug->getStream();
     log << "---Initial constraints for the given expression---\n";
     expr->dump(log);
@@ -3467,7 +3468,7 @@ bool TypeChecker::convertToType(Expr *&expr, Type type, DeclContext *dc,
   }
 
   auto &solution = viable[0];
-  if (getLangOpts().DebugConstraintSolver) {
+  if (Context.LangOpts.DebugConstraintSolver) {
     auto &log = Context.TypeCheckerDebug->getStream();
     log << "---Solution---\n";
     solution.dump(log);
@@ -3485,7 +3486,7 @@ bool TypeChecker::convertToType(Expr *&expr, Type type, DeclContext *dc,
 
   solution.setExprTypes(expr);
 
-  if (getLangOpts().DebugConstraintSolver) {
+  if (Context.LangOpts.DebugConstraintSolver) {
     auto &log = Context.TypeCheckerDebug->getStream();
     log << "---Type-checked expression---\n";
     result->dump(log);

lib/Sema/TypeCheckExprObjC.cpp

@@ -30,7 +30,8 @@ Optional<Type> TypeChecker::checkObjCKeyPathExpr(DeclContext *dc,
   if (expr->getObjCStringLiteralExpr() && !requireResultType) return None;
 
   // ObjC #keyPath only makes sense when we have the Objective-C runtime.
-  auto &diags = dc->getASTContext().Diags;
+  auto &Context = dc->getASTContext();
+  auto &diags = Context.Diags;
   if (!Context.LangOpts.EnableObjCInterop) {
     diags.diagnose(expr->getLoc(), diag::expr_keypath_no_objc_runtime);
 

lib/Sema/TypeCheckStmt.cpp

@@ -832,7 +832,7 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
             ->getParams()[0].getPlainType().subst(witness.getSubstitutions());
 
       // Necessary type coersion for method application.
-      if (TC.convertToType(sequence, newSequenceType, DC, None)) {
+      if (TypeChecker::convertToType(sequence, newSequenceType, DC, None)) {
         return nullptr;
       }
       S->setSequence(sequence);

lib/Sema/TypeChecker.cpp

@@ -639,7 +639,8 @@ static Optional<Type> getTypeOfCompletionContextExpr(
   case CompletionTypeCheckKind::KeyPath:
     referencedDecl = nullptr;
     if (auto keyPath = dyn_cast<KeyPathExpr>(parsedExpr))
-      return TC.checkObjCKeyPathExpr(DC, keyPath, /*requireResultType=*/true);
+      return TypeChecker::checkObjCKeyPathExpr(DC, keyPath,
+                                               /*requireResultType=*/true);
 
     return None;
   }

lib/Sema/TypeChecker.h

@@ -1199,8 +1199,8 @@ class TypeChecker final {
   /// Check the key-path expression.
   ///
   /// Returns the type of the last component of the key-path.
-  Optional<Type> checkObjCKeyPathExpr(DeclContext *dc, KeyPathExpr *expr,
-                                      bool requireResultType = false);
+  static Optional<Type> checkObjCKeyPathExpr(DeclContext *dc, KeyPathExpr *expr,
+                                             bool requireResultType = false);
 
   /// Type check whether the given type declaration includes members of
   /// unsupported recursive value types.
@@ -1397,8 +1397,8 @@ class TypeChecker final {
   ///   from where the toType is derived, so that we can deliver better fixit.
   ///
   /// \returns true if an error occurred, false otherwise.
-  bool convertToType(Expr *&expr, Type type, DeclContext *dc,
-                     Optional<Pattern*> typeFromPattern = None);
+  static bool convertToType(Expr *&expr, Type type, DeclContext *dc,
+                            Optional<Pattern*> typeFromPattern = None);
 
   /// Coerce the given expression to materializable type, if it
   /// isn't already.