not perform check if the disjuction choice goes to bridging coercion constraint

Author: LucianoPAlmeida

lib/Sema/CSSimplify.cpp

@@ -2807,7 +2807,8 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
 
   // If the types are obviously equivalent, we're done.
   if (desugar1->isEqual(desugar2)) {
-    if (locator.getBaseLocator()->isLastElement(ConstraintLocator::PathElementKind::ExplicityTypeCoercion)) {
+    if (locator.getBaseLocator()->
+        isLastElement(ConstraintLocator::PathElementKind::ExplicityTypeCoercion)) {
       auto *fix = RemoveUnecessaryCoercion::create(*this, type2,
                                                    locator.getBaseLocator());
       recordFix(fix);
@@ -7759,11 +7760,13 @@ void ConstraintSystem::addExplicitConversionConstraint(
                        fromType, toType, locatorPtr);
   coerceConstraint->setFavored();
   constraints.push_back(coerceConstraint);
-
+  
+  auto bridgingPtr = getConstraintLocator(
+                       locator.withPathElement(LocatorPathElt::BridgingTypeCoercion()));
   // The source type can be explicitly converted to the destination type.
   Constraint *bridgingConstraint =
   Constraint::create(*this, ConstraintKind::BridgingConversion,
-                     fromType, toType, locatorPtr);
+                     fromType, toType, bridgingPtr);
   constraints.push_back(bridgingConstraint);
 
   if (allowFixes && shouldAttemptFixes()) {

lib/Sema/ConstraintLocator.cpp

@@ -85,6 +85,7 @@ void ConstraintLocator::Profile(llvm::FoldingSetNodeID &id, Expr *anchor,
     case KeyPathValue:
     case KeyPathComponentResult:
     case ExplicityTypeCoercion:
+    case BridgingTypeCoercion:
       auto numValues = numNumericValuesInPathElement(elt.getKind());
       for (unsigned i = 0; i < numValues; ++i)
         id.AddInteger(elt.getValue(i));
@@ -417,6 +418,10 @@ void ConstraintLocator::dump(SourceManager *sm, raw_ostream &out) {
     case ExplicityTypeCoercion:
       out << "type coercion";
       break;
+      
+    case BridgingTypeCoercion:
+      out << "bridging type coercion";
+      break;
     }
   }
   out << ']';

lib/Sema/ConstraintLocator.h

@@ -139,6 +139,8 @@ class ConstraintLocator : public llvm::FoldingSetNode {
     KeyPathComponentResult,
     /// A explicity type coercion
     ExplicityTypeCoercion,
+    /// A bridging type coercion
+    BridgingTypeCoercion
   };
 
   /// Determine the number of numeric values used for the given path
@@ -173,6 +175,7 @@ class ConstraintLocator : public llvm::FoldingSetNode {
     case KeyPathValue:
     case KeyPathComponentResult:
     case ExplicityTypeCoercion:
+    case BridgingTypeCoercion:
       return 0;
 
     case ContextualType:
@@ -245,6 +248,7 @@ class ConstraintLocator : public llvm::FoldingSetNode {
     case KeyPathValue:
     case KeyPathComponentResult:
     case ExplicityTypeCoercion:
+    case BridgingTypeCoercion:
       return 0;
 
     case FunctionArgument:
@@ -364,6 +368,7 @@ class ConstraintLocator : public llvm::FoldingSetNode {
     class OpenedGeneric;
     class KeyPathDynamicMember;
     class ExplicitTypeCoercion;
+    class BridgingTypeCoercion;
 
     PathElement(PathElementKind kind)
       : storage(encodeStorage(kind, 0)), storedKind(StoredKindAndValue)
@@ -904,6 +909,17 @@ class LocatorPathElt::ExplicitTypeCoercion final : public LocatorPathElt {
   }
 };
 
+
+class LocatorPathElt::BridgingTypeCoercion final : public LocatorPathElt {
+public:
+  BridgingTypeCoercion()
+  : LocatorPathElt(ConstraintLocator::BridgingTypeCoercion) {}
+
+  static bool classof(const LocatorPathElt *elt) {
+    return elt->getKind() == ConstraintLocator::BridgingTypeCoercion;
+  }
+};
+
 /// A simple stack-only builder object that constructs a
 /// constraint locator without allocating memory.
 ///