Fix implementation

Author: LucianoPAlmeida

lib/Sema/CSGen.cpp

@@ -2659,9 +2659,7 @@ namespace {
       CS.setType(expr->getCastTypeLoc(), toType);
 
       auto fromType = CS.getType(expr->getSubExpr());
-      
-      auto pathElt = LocatorPathElt(ConstraintLocator::TypeCoercion);
-      auto locator = CS.getConstraintLocator(expr, pathElt);
+      auto locator = CS.getConstraintLocator(expr);
 
       // Add a conversion constraint for the direct conversion between
       // types.

lib/Sema/CSSimplify.cpp

@@ -2812,14 +2812,15 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
         }
       }
 
+      // If we are trying to perform coercion to the same type emit a warning.
       if (locator.getBaseLocator()->isTypeCoercion()) {
-        auto expr = dyn_cast<CoerceExpr>(locator.getBaseLocator()->getAnchor());
-        if (!shouldSuppressDiagnostics()) {
-          // If we are trying to perform coercion to the same type emit a warning.
-          if (type1->getCanonicalType()->isEqual(type2->getCanonicalType())) {
-            TC.diagnose(expr->getLoc(), diag::unecessary_same_type_coercion, type2)
-              .fixItRemove(SourceRange(expr->getLoc(),
-                                       expr->getCastTypeLoc().getSourceRange().End));
+        if (auto expr = dyn_cast<CoerceExpr>(locator.getBaseLocator()->getAnchor())) {
+          if (!shouldSuppressDiagnostics()) {
+            if (type1->getCanonicalType()->isEqual(type2->getCanonicalType())) {
+              TC.diagnose(expr->getLoc(), diag::unecessary_same_type_coercion, type2)
+                .fixItRemove(SourceRange(expr->getLoc(),
+                                         expr->getCastTypeLoc().getSourceRange().End));
+            }
           }
         }
       }
@@ -7521,9 +7522,12 @@ void ConstraintSystem::addExplicitConversionConstraint(
   auto locatorPtr = getConstraintLocator(locator);
 
   // Coercion (the common case).
+  auto coercionPath = LocatorPathElt(ConstraintLocator::TypeCoercion);
+  auto coerceLocator = getConstraintLocator(locator.getBaseLocator(),
+                                            coercionPath);
   Constraint *coerceConstraint =
     Constraint::create(*this, ConstraintKind::Conversion,
-                       fromType, toType, locatorPtr);
+                       fromType, toType, coerceLocator);
   coerceConstraint->setFavored();
   constraints.push_back(coerceConstraint);
 

test/expr/cast/as_coerce.swift

@@ -137,18 +137,18 @@ _ = sr6022_1 as! Any // expected-warning {{forced cast from '() -> ()' to 'Any'
 _ = sr6022_1 as? Any // expected-warning {{conditional cast from '() -> ()' to 'Any' always succeeds}}
 
 // SR-11295
-let a = "Hello"
-_ = a as String // expected-warning {{casting expression to 'String' doesn't change the type}} {{7-17=}}
+let sr11295a = "Hello"
+_ = sr11295a as String // expected-warning {{casting expression to 'String' doesn't change the type}} {{7-17=}}
 
-let b = 1
-_ = b as Int // expected-warning {{casting expression to 'Int' doesn't change the type}} {{7-14=}}
+let sr11295b = 1
+_ = sr11295b as Int // expected-warning {{casting expression to 'Int' doesn't change the type}} {{7-14=}}
 
 typealias Type = String
 
-let c: Type = "Hello Typealias" 
-_ = c as String // expected-warning {{casting expression to 'String' doesn't change the type}} {{7-17=}}
+let sr11295c: Type = "Hello Typealias"
+_ = sr11295c as String // expected-warning {{casting expression to 'String' doesn't change the type}} {{7-17=}}
 
-let d = "Hello Typealias"
-_ = d as Type // expected-warning {{casting expression to 'Type' (aka 'String') doesn't change the type}} {{7-15=}}
+let sr11295d = "Hello Typealias"
+_ = sr11295d as Type // expected-warning {{casting expression to 'Type' (aka 'String') doesn't change the type}} {{7-15=}}
 
 _ = "Hello" as String // expected-warning {{casting expression to 'String' doesn't change the type}} {{13-23=}}