[WIP] checkpoint

Author: LucianoPAlmeida

lib/Sema/CSApply.cpp

@@ -3525,12 +3525,12 @@ namespace {
       // Turn the subexpression into an rvalue.
       auto rvalueSub = cs.coerceToRValue(expr->getSubExpr());
       expr->setSubExpr(rvalueSub);
-      
-      auto *locator = cs.getConstraintLocator(expr);
-      
+
       // If we weren't explicitly told by the caller which disjunction choice,
       // get it from the solution to determine whether we've picked a coercion
       // or a bridging conversion.
+      auto *locator = cs.getConstraintLocator(expr);
+
       if (!choice) {
         choice = solution.getDisjunctionChoice(locator);
       }

lib/Sema/CSSimplify.cpp

@@ -2797,6 +2797,20 @@ ConstraintSystem::TypeMatchResult
 ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
                              TypeMatchOptions flags,
                              ConstraintLocatorBuilder locator) {
+  
+  if (!type1->isTypeVariableOrMember()
+      && !type2->isTypeVariableOrMember()
+      && type1->isEqual(type2)) {
+    if (locator.getBaseLocator()->
+        isLastElement(ConstraintLocator::PathElementKind::ExplicityTypeCoercion)) {
+      if (!hasFixFor(locator.getBaseLocator())) {
+        auto *fix = RemoveUnecessaryCoercion::create(*this, type2,
+                                                     locator.getBaseLocator());
+        recordFix(fix);
+      }
+    }
+  }
+  
   // If we have type variables that have been bound to fixed types, look through
   // to the fixed type.
   type1 = getFixedTypeRecursive(type1, flags, kind == ConstraintKind::Equal);
@@ -2806,15 +2820,9 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
   auto desugar2 = type2->getDesugaredType();
 
   // If the types are obviously equivalent, we're done.
-  if (desugar1->isEqual(desugar2)) {
-    if (locator.getBaseLocator()->
-        isLastElement(ConstraintLocator::PathElementKind::ExplicityTypeCoercion)) {
-      auto *fix = RemoveUnecessaryCoercion::create(*this, type2,
-                                                   locator.getBaseLocator());
-      recordFix(fix);
-    }
-    if (!isa<InOutType>(desugar2))
-      return getTypeMatchSuccess();
+  if (desugar1->isEqual(desugar2)
+      && !isa<InOutType>(desugar2)) {
+    return getTypeMatchSuccess();
   }
 
   // Local function that should be used to produce the return value whenever
@@ -7756,10 +7764,7 @@ void ConstraintSystem::addExplicitConversionConstraint(
   auto coerceLocator = [&]() {
     if (auto expr = dyn_cast_or_null<CoerceExpr>(locatorPtr->getAnchor())) {
       // Only adding this path for explicty coercions e.g _ = a as Int
-      // and for non literal/array-literal subExpr.
-      if (!expr->isImplicit()
-          && !isa<LiteralExpr>(expr->getSubExpr())
-          && !isa<CollectionExpr>(expr->getSubExpr()))
+      if (!expr->isImplicit())
         return getConstraintLocator(expr, LocatorPathElt::ExplicitTypeCoercion());
     }
     return locatorPtr;