Updating check location.

Author: LucianoPAlmeida

lib/Sema/CSApply.cpp

@@ -3525,12 +3525,20 @@ namespace {
       // Turn the subexpression into an rvalue.
       auto rvalueSub = cs.coerceToRValue(expr->getSubExpr());
       expr->setSubExpr(rvalueSub);
-
+      
+      auto *locator = [&]() {
+        // 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()))
+          return cs.getConstraintLocator(expr, LocatorPathElt::ExplicitTypeCoercion());
+        return 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/CSGen.cpp

@@ -2661,7 +2661,15 @@ namespace {
       CS.setType(expr->getCastTypeLoc(), toType);
 
       auto fromType = CS.getType(expr->getSubExpr());
-      auto locator = CS.getConstraintLocator(expr);
+      auto locator = [&]() {
+        // 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()))
+          return CS.getConstraintLocator(expr, LocatorPathElt::ExplicitTypeCoercion());
+        return CS.getConstraintLocator(expr);
+      }();
 
       // Add a conversion constraint for the direct conversion between
       // types.
@@ -2672,7 +2680,7 @@ namespace {
       // bindings for the result of the coercion.
       auto *TR = expr->getCastTypeLoc().getTypeRepr();
       if (TR && TR->getKind() == TypeReprKind::ImplicitlyUnwrappedOptional)
-        return createTypeVariableAndDisjunctionForIUOCoercion(toType, locator);
+        return createTypeVariableAndDisjunctionForIUOCoercion(toType, CS.getConstraintLocator(expr));
 
       return toType;
     }

lib/Sema/CSSimplify.cpp

@@ -7754,21 +7754,9 @@ void ConstraintSystem::addExplicitConversionConstraint(
   auto locatorPtr = getConstraintLocator(locator);
 
   // Coercion (the common case).
-  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 lireal subExpr.
-      if (!expr->isImplicit()
-          && !isa<LiteralExpr>(expr->getSubExpr())
-          && !isa<CollectionExpr>(expr->getSubExpr()))
-        return getConstraintLocator(locator.getBaseLocator(), LocatorPathElt::ExplicitTypeCoercion());
-    }
-    return locatorPtr;
-  }();
-  
   Constraint *coerceConstraint =
     Constraint::create(*this, ConstraintKind::Conversion,
-                       fromType, toType, coerceLocator);
+                       fromType, toType, locatorPtr);
   coerceConstraint->setFavored();
   constraints.push_back(coerceConstraint);
 

lib/Sema/ConstraintLocator.h

@@ -34,7 +34,6 @@ namespace swift {
 
 class Expr;
 class SourceManager;
-class CoerceExpr;
 
 namespace constraints {
   class ConstraintSystem;