Merge pull request #60568 from xedin/rdar-98577451

[CSApply] Attempt value-to-opaque-result abstraction only after canon…

Author: xedin

lib/Sema/CSApply.cpp

@@ -6858,11 +6858,11 @@ Expr *ExprRewriter::coerceToType(Expr *expr, Type toType,
   // below is just an approximate check since the above would be expensive to
   // verify and still relies on the type checker ensuing `fromType` is
   // compatible with any opaque archetypes.
-  if (toType->hasOpaqueArchetype() &&
+  if (toType->getCanonicalType()->hasOpaqueArchetype() &&
       cs.getConstraintLocator(locator)->isForContextualType()) {
     // Find the opaque type declaration. We need its generic signature.
     OpaqueTypeDecl *opaqueDecl = nullptr;
-    bool found = toType.findIf([&](Type type) {
+    bool found = toType->getCanonicalType().findIf([&](Type type) {
       if (auto opaqueType = type->getAs<OpaqueTypeArchetypeType>()) {
         opaqueDecl = opaqueType->getDecl();
         return true;

validation-test/Sema/type_checker_crashers_fixed/rdar98577451.swift

@@ -0,0 +1,21 @@
+// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.15
+
+// REQUIRES: objc_interop
+// REQUIRES: OS=macosx
+
+protocol P {
+  associatedtype T
+  func f() -> T
+}
+
+struct S: P {
+  func f() -> some Any { return 3 }
+}
+
+struct G<T> {
+  typealias Foo = (T?, S.T)
+}
+
+func f<T>(t: T) -> G<T>.Foo {
+  return (t, S().f()) // Ok
+}