Merge pull request #64676 from xedin/rdar-107280056

[ConstraintSystem] `openOpaqueType`: remove logic that duplicates `bindArchetypesFromContext`

Author: xedin

lib/Sema/ConstraintSystem.cpp

@@ -1009,22 +1009,11 @@ Type ConstraintSystem::openOpaqueType(OpaqueTypeArchetypeType *opaque,
   // underlying return type.
   auto opaqueLocator = locator.withPathElement(
       LocatorPathElt::OpenedOpaqueArchetype(opaqueDecl));
+
   OpenedTypeMap replacements;
   openGeneric(DC, opaqueDecl->getOpaqueInterfaceGenericSignature(),
               opaqueLocator, replacements);
 
-  // If there is an outer generic signature, bind the outer parameters based
-  // on the substitutions in the opaque type.
-  auto subs = opaque->getSubstitutions();
-  if (auto genericSig = subs.getGenericSignature()) {
-    for (auto *genericParamPtr : genericSig.getGenericParams()) {
-      Type genericParam(genericParamPtr);
-      addConstraint(
-          ConstraintKind::Bind, openType(genericParam, replacements),
-          genericParam.subst(subs), opaqueLocator);
-    }
-  }
-
   recordOpenedTypes(opaqueLocatorKey, replacements);
 
   return openType(opaque->getInterfaceType(), replacements);
@@ -1773,6 +1762,8 @@ static void bindArchetypesFromContext(
     auto genericSig = parentDC->getGenericSignatureOfContext();
     for (auto *paramTy : genericSig.getGenericParams()) {
       Type contextTy = cs.DC->mapTypeIntoContext(paramTy);
+      if (paramTy->isParameterPack())
+        contextTy = PackType::getSingletonPackExpansion(contextTy);
       bindPrimaryArchetype(paramTy, contextTy);
     }
 

test/Constraints/pack-expansion-expressions.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
+// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature VariadicGenerics
 
 // REQUIRES: asserts
 
@@ -339,3 +339,18 @@ func test_pack_expansion_specialization() {
   _ = Data<Int, String>(42, "") // Ok
   _ = Data<Int>(42, "") // expected-error {{extra argument in call}}
 }
+
+// rdar://107280056 - "Ambiguous without more context" with opaque return type + variadics
+protocol Q {
+  associatedtype B
+}
+
+do {
+  struct G<each T>: Q {
+    typealias B = (repeat each T)
+  }
+
+  func f<each T>(_: repeat each T) -> some Q {
+    return G<repeat each T>() // Ok
+  }
+}