Merge pull request #30113 from xedin/rdar-54580247

[CSBindings] Open collection before binding parameter only if origina…

Author: xedin

lib/Sema/CSBindings.cpp

@@ -1043,6 +1043,25 @@ bool TypeVarBindingProducer::computeNext() {
       if (auto simplifiedSuper = CS.checkTypeOfBinding(TypeVar, supertype))
         addNewBinding(binding.withType(*simplifiedSuper));
     }
+
+    auto srcLocator = binding.getLocator();
+    if (srcLocator &&
+        srcLocator->isLastElement<LocatorPathElt::ApplyArgToParam>() &&
+        !type->hasTypeVariable() && CS.isCollectionType(type)) {
+      // If the type binding comes from the argument conversion, let's
+      // instead of binding collection types directly, try to bind
+      // using temporary type variables substituted for element
+      // types, that's going to ensure that subtype relationship is
+      // always preserved.
+      auto *BGT = type->castTo<BoundGenericType>();
+      auto UGT = UnboundGenericType::get(BGT->getDecl(), BGT->getParent(),
+                                         BGT->getASTContext());
+
+      auto dstLocator = TypeVar->getImpl().getLocator();
+      auto newType = CS.openUnboundGenericType(UGT, dstLocator)
+                         ->reconstituteSugar(/*recursive=*/false);
+      addNewBinding(binding.withType(newType));
+    }
   }
 
   if (newBindings.empty())
@@ -1062,20 +1081,6 @@ bool TypeVariableBinding::attempt(ConstraintSystem &cs) const {
   if (Binding.hasDefaultedLiteralProtocol()) {
     type = cs.openUnboundGenericType(type, dstLocator);
     type = type->reconstituteSugar(/*recursive=*/false);
-  } else if (srcLocator &&
-             srcLocator->isLastElement<LocatorPathElt::ApplyArgToParam>() &&
-             !type->hasTypeVariable() && cs.isCollectionType(type)) {
-    // If the type binding comes from the argument conversion, let's
-    // instead of binding collection types directly, try to bind
-    // using temporary type variables substituted for element
-    // types, that's going to ensure that subtype relationship is
-    // always preserved.
-    auto *BGT = type->castTo<BoundGenericType>();
-    auto UGT = UnboundGenericType::get(BGT->getDecl(), BGT->getParent(),
-                                       BGT->getASTContext());
-
-    type = cs.openUnboundGenericType(UGT, dstLocator);
-    type = type->reconstituteSugar(/*recursive=*/false);
   }
 
   cs.addConstraint(ConstraintKind::Bind, TypeVar, type, srcLocator);

lib/Sema/CSSimplify.cpp

@@ -3800,9 +3800,11 @@ bool ConstraintSystem::repairFailures(
     if (tupleLocator->isLastElement<LocatorPathElt::SequenceElementType>())
       break;
 
-    // Generic argument failures have a more general fix which is attached to a
-    // parent type and aggregates all argument failures into a single fix.
-    if (tupleLocator->isLastElement<LocatorPathElt::GenericArgument>())
+    // Generic argument/requirement failures have a more general fix which
+    // is attached to a parent type and aggregates all argument failures
+    // into a single fix.
+    if (tupleLocator->isLastElement<LocatorPathElt::AnyRequirement>() ||
+        tupleLocator->isLastElement<LocatorPathElt::GenericArgument>())
       break;
 
     ConstraintFix *fix;

test/Constraints/construction.swift

@@ -216,7 +216,6 @@ func rdar_50668864() {
   struct Foo {
     init(anchors: [Int]) { // expected-note {{'init(anchors:)' declared here}}
       self = .init { _ in [] } // expected-error {{trailing closure passed to parameter of type '[Int]' that does not accept a closure}}
-      // expected-error@-1 {{generic parameter 'Element' could not be inferred}}
     }
   }
 }

validation-test/Sema/type_checker_perf/slow/rdar54580427.swift renamed to validation-test/Sema/type_checker_perf/fast/rdar54580427.swift

@@ -1,7 +1,5 @@
-// FIXME: This should be linear instead of exponential.
-// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes --invert-result %s -Xfrontend=-solver-expression-time-threshold=1
+// RUN: %scale-test --begin 1 --end 20 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-expression-time-threshold=1
 // REQUIRES: asserts,no_asan
-// REQUIRES: rdar57138194,SR11770
 
 enum Val {
   case d([String: Val])