[CSDiagnostics] Removing duplicated diagnose for InstanceType

Author: LucianoPAlmeida

lib/Sema/CSDiag.cpp

@@ -1877,18 +1877,6 @@ bool FailureDiagnosis::visitApplyExpr(ApplyExpr *callExpr) {
   return true;
 }
 
-<<<<<<< HEAD
-bool FailureDiagnosis::visitCoerceExpr(CoerceExpr *CE) {
-  // Coerce the input to whatever type is specified by the CoerceExpr.
-  auto expr = typeCheckChildIndependently(CE->getSubExpr(),
-                                          CS.getType(CE->getCastTypeLoc()),
-                                          CTP_CoerceOperand);
-  if (!expr)
-    return true;
-
-  return false;
-}
-
 bool FailureDiagnosis::
 visitRebindSelfInConstructorExpr(RebindSelfInConstructorExpr *E) {
   // Don't walk the children for this node, it leads to multiple diagnostics

lib/Sema/CSDiagnostics.cpp

@@ -4779,13 +4779,6 @@ bool MissingContextualConformanceFailure::diagnoseAsError() {
       break;
     }
 
-    case ConstraintLocator::InstanceType: {
-      // If the missing conformance involves a coercion of metatypes
-      if (diagnoseCoercionToUnrelatedType())
-        return true;
-      break;
-    }
-
     default:
       break;
     }