Merge pull request #41109 from xedin/rdar-88285682-5.6

[5.6][CSApply] Result coercion check should always use resolved type

Author: xedin

lib/Sema/CSApply.cpp

@@ -8695,7 +8695,7 @@ ExprWalker::rewriteTarget(SolutionApplicationTarget target) {
       return convertType &&
           !convertType->hasPlaceholder() &&
           !target.isOptionalSomePatternInit() &&
-          !(solution.getType(resultExpr)->isUninhabited() &&
+          !(solution.getResolvedType(resultExpr)->isUninhabited() &&
             cs.getContextualTypePurpose(target.getAsExpr())
               == CTP_ReturnSingleExpr);
     };

validation-test/Sema/type_checker_crashers_fixed/rdar88285682.swift

@@ -0,0 +1,19 @@
+// RUN: %target-typecheck-verify-swift
+
+struct S {
+  func crash() -> Never {
+    fatalError("")
+  }
+}
+
+class A {
+  func value() -> Int { 42 }
+}
+
+class B : A {
+  let value: S = S()
+
+  func test() throws -> B {
+    value.crash() // Ok
+  }
+}