Remove TypeChecker::Diags

Author: CodaFi

lib/Sema/CSDiagnostics.cpp

@@ -1042,7 +1042,7 @@ bool MissingExplicitConversionFailure::diagnoseAsError() {
     return false;
 
   bool useAs = TypeChecker::isExplicitlyConvertibleTo(fromType, toType, DC);
-  if (!useAs && TypeChecker::checkedCastMaySucceed(fromType, toType, DC))
+  if (!useAs && !TypeChecker::checkedCastMaySucceed(fromType, toType, DC))
     return false;
 
   auto *expr = findParentExpr(getAnchor());

lib/Sema/TypeCheckConstraints.cpp

@@ -2185,7 +2185,7 @@ Type TypeChecker::typeCheckExpressionImpl(Expr *&expr, DeclContext *dc,
   // Construct a constraint system from this expression.
   ConstraintSystemOptions csOptions = ConstraintSystemFlags::AllowFixes;
 
-  if (DiagnosticSuppression::isEnabled(Diags))
+  if (DiagnosticSuppression::isEnabled(Context.Diags))
     csOptions |= ConstraintSystemFlags::SuppressDiagnostics;
 
   if (options.contains(TypeCheckExprFlags::AllowUnresolvedTypeVariables))

lib/Sema/TypeChecker.cpp

@@ -62,7 +62,7 @@ TypeChecker &TypeChecker::createForContext(ASTContext &ctx) {
 }
 
 TypeChecker::TypeChecker(ASTContext &Ctx)
-  : Context(Ctx), Diags(Ctx.Diags) {}
+  : Context(Ctx) {}
 
 TypeChecker::~TypeChecker() {}
 

lib/Sema/TypeChecker.h

@@ -543,7 +543,6 @@ class TypeChecker final {
 
 private:
   ASTContext &Context;
-  DiagnosticEngine &Diags;
 
   /// The set of expressions currently being analyzed for failures.
   llvm::DenseMap<Expr*, Expr*> DiagnosedExprs;