Merge pull request #40083 from hamishknight/dont-favor-tuple-elements

Author: hamishknight

lib/Sema/CSGen.cpp

@@ -238,10 +238,9 @@ namespace {
         return { false, expr };
       }      
 
-      // For exprs of a structural type that are not modeling argument lists,
-      // avoid merging the type variables. (We need to allow for cases like
+      // For exprs of a tuple, avoid favoring. (We need to allow for cases like
       // (Int, Int32).)
-      if (isa<TupleExpr>(expr) && !isa<ApplyExpr>(Parent.getAsExpr())) {
+      if (isa<TupleExpr>(expr)) {
         return { false, expr };
       }
 

test/Constraints/ranking_ambiguities.swift

@@ -58,3 +58,18 @@ struct S4 {
     _ = S4() // expected-error {{ambiguous use of 'init'}}
   }
 }
+
+infix operator ^^^
+func ^^^ (lhs: (Int, Int), rhs: Int) -> Int { 0 }  // expected-note {{found this candidate}}
+func ^^^ (lhs: (Int, Int), rhs: Int) -> String { "" }  // expected-note {{found this candidate}}
+
+// We shouldn't favor based on the type of a tuple element.
+struct S5 {
+  init(_ x: Int) {}
+  init(_ x: String) {}
+
+  func testFavoring() {
+    let x = 0
+    _ = S5((x, 0) ^^^ 0) // expected-error {{ambiguous use of operator '^^^'}}
+  }
+}