[Sema] Adjusting repairArraLiteralUsedAsDictionary to also ignore OptToOpt promotions

Author: LucianoPAlmeida

lib/Sema/CSSimplify.cpp

@@ -4228,14 +4228,16 @@ static bool repairArrayLiteralUsedAsDictionary(
   if (auto *fix = TreatArrayLiteralAsDictionary::attempt(cs, dictType,
                                                          arrayType, loc)) {
     // Ignore any attempts at promoting the value to an optional as even after
-    // stripping off all optionals above the underlying types don't match (array
+    // stripping off all optionals above the underlying types won't match (array
     // vs dictionary).
     conversionsOrFixes.erase(
         llvm::remove_if(conversionsOrFixes,
                         [&](RestrictionOrFix &E) {
                           if (auto restriction = E.getRestriction())
-                            return *restriction ==
-                                   ConversionRestrictionKind::ValueToOptional;
+                            return *restriction == ConversionRestrictionKind::
+                                                       ValueToOptional ||
+                                   *restriction == ConversionRestrictionKind::
+                                                       OptionalToOptional;
                           return false;
                         }),
         conversionsOrFixes.end());
@@ -4702,6 +4704,12 @@ bool ConstraintSystem::repairFailures(
         return true;
       }
 
+      // If we are trying to assign e.g. `Array<Int>` to `Array<Float>` let's
+      // give solver a chance to determine which generic parameters are
+      // mismatched and produce a fix for that.
+      if (hasConversionOrRestriction(ConversionRestrictionKind::DeepEquality))
+        return false;
+
       // An attempt to assign `Int?` to `String?`.
       if (hasConversionOrRestriction(
               ConversionRestrictionKind::OptionalToOptional)) {
@@ -4710,12 +4718,6 @@ bool ConstraintSystem::repairFailures(
         return true;
       }
 
-      // If we are trying to assign e.g. `Array<Int>` to `Array<Float>` let's
-      // give solver a chance to determine which generic parameters are
-      // mismatched and produce a fix for that.
-      if (hasConversionOrRestriction(ConversionRestrictionKind::DeepEquality))
-        return false;
-
       // If the situation has to do with protocol composition types and
       // destination doesn't have one of the conformances e.g. source is
       // `X & Y` but destination is only `Y` or vice versa, there is a

test/Constraints/closures.swift

@@ -371,6 +371,7 @@ func rdar21078316() {
   var foo : [String : String]?
   var bar : [(String, String)]?
   bar = foo.map { ($0, $1) }  // expected-error {{contextual closure type '([String : String]) throws -> [(String, String)]' expects 1 argument, but 2 were used in closure body}}
+  // expected-error@-1{{cannot convert value of type '(Dictionary<String, String>, _)' to closure result type '[(String, String)]'}}
 }
 
 

test/Constraints/dictionary_literal.swift

@@ -175,6 +175,8 @@ class S59215 {
     // expected-note@-1{{did you mean to use a dictionary literal instead?}} {{17-18=:}}
     m["a"] = [1 , 1] //expected-error{{dictionary of type '[String : String]' cannot be used with array literal}}
     // expected-note@-1{{did you mean to use a dictionary literal instead?}} {{17-18=:}}
+    m["a"] = Optional(["", ""]) //expected-error{{dictionary of type '[String : String]' cannot be used with array literal}}
+    // expected-note@-1{{did you mean to use a dictionary literal instead?}} {{26-27=:}}
   }
 }