Revertive extra flag

Author: LucianoPAlmeida

lib/Sema/CSGen.cpp

@@ -2666,15 +2666,13 @@ namespace {
       // Add a conversion constraint for the direct conversion between
       // types.
       CS.addExplicitConversionConstraint(fromType, toType,
-                                         /*allowFixes=*/true,
-                                         /*addCoercionPathElt*/true,
-                                         locator);
+                                         /*allowFixes=*/true, locator);
 
       // If the result type was declared IUO, add a disjunction for
       // bindings for the result of the coercion.
       auto *TR = expr->getCastTypeLoc().getTypeRepr();
       if (TR && TR->getKind() == TypeReprKind::ImplicitlyUnwrappedOptional)
-        return createTypeVariableAndDisjunctionForIUOCoercion(toType, CS.getConstraintLocator(expr));
+        return createTypeVariableAndDisjunctionForIUOCoercion(toType, locator);
 
       return toType;
     }

lib/Sema/CSSimplify.cpp

@@ -5786,12 +5786,10 @@ ConstraintSystem::simplifyBridgingConstraint(Type type1,
     if (auto toKeyValue = isDictionaryType(unwrappedToType)) {
       addExplicitConversionConstraint(fromKeyValue->first, toKeyValue->first,
                                       /*allowFixes=*/false,
-                                      /*addCoercionPathElt*/false,
                                       locator.withPathElement(
                                         LocatorPathElt::GenericArgument(0)));
       addExplicitConversionConstraint(fromKeyValue->second, toKeyValue->second,
                                       /*allowFixes=*/false,
-                                      /*addCoercionPathElt*/false,
                                       locator.withPathElement(
                                         LocatorPathElt::GenericArgument(0)));
       countOptionalInjections();
@@ -7772,13 +7770,12 @@ void ConstraintSystem::addConstraint(ConstraintKind kind, Type first,
 void ConstraintSystem::addExplicitConversionConstraint(
                                            Type fromType, Type toType,
                                            bool allowFixes,
-                                           bool addCoercionPathElt,
                                            ConstraintLocatorBuilder locator) {
   SmallVector<Constraint *, 3> constraints;
 
   auto locatorPtr = getConstraintLocator(locator);
   auto coerceLocator = [&]() {
-    if (addCoercionPathElt && shouldAttemptFixes()) {
+    if (allowFixes && shouldAttemptFixes()) {
       if (auto *expr = dyn_cast_or_null<CoerceExpr>(locator.getAnchor())) {
         // Only adding this path for explicty coercions e.g _ = a as Int
         // and also only for left-side is a DeclRefExpr or a

lib/Sema/ConstraintSystem.h

@@ -2191,7 +2191,6 @@ class ConstraintSystem {
   /// Add an explicit conversion constraint (e.g., \c 'x as T').
   void addExplicitConversionConstraint(Type fromType, Type toType,
                                        bool allowFixes,
-                                       bool addCoercionPathElt,
                                        ConstraintLocatorBuilder locator);
 
   /// Add a disjunction constraint.