Merge pull request #42536 from xedin/rdar-90366182-5.7

[5.7][CSApply] Rewrite types of a constructed tuple

Author: xedin

lib/Sema/CSApply.cpp

@@ -7779,7 +7779,15 @@ Expr *ExprRewriter::finishApply(ApplyExpr *apply, Type openedType,
     auto *packed = apply->getArgs()->packIntoImplicitTupleOrParen(
         ctx, [&](Expr *E) { return cs.getType(E); });
     cs.cacheType(packed);
-    return coerceToType(packed, tupleTy, cs.getConstraintLocator(packed));
+    auto *result = coerceToType(packed, tupleTy, cs.getConstraintLocator(packed));
+    // Resetting the types of tuple is necessary because
+    // `packIntoImplicitTupleOrParen` sets types in AST
+    // where `coerceToType` only updates constraint system
+    // cache. This creates a mismatch that would not be
+    // corrected by `setExprTypes` if this tuple is used
+    // as an argument that is wrapped in an autoclosure.
+    solution.setExprTypes(result);
+    return result;
   }
 
   // We're constructing a value of nominal type. Look for the constructor or

validation-test/Sema/type_checker_crashers_fixed/rdar90366182.swift

@@ -0,0 +1,24 @@
+// RUN: %target-typecheck-verify-swift
+
+class Data {
+}
+
+class Test {
+  var lastIndex: Int = 0
+
+  func test(_ arr: [[Data]]) {
+    typealias I = (index: Int, data: [Int])
+
+    struct Pair: Hashable {
+      var lhs: Int
+      var rhs: Int
+    }
+
+    let data = [Pair: I]()
+    for index in 0..<arr.count {
+      for (idx, _) in arr[index].enumerated() {
+        _ = data[Pair(lhs: index, rhs: idx)] ?? I(index: lastIndex, data: [Int]()) // Ok
+      }
+    }
+  }
+}