Merge pull request #21002 from xedin/rdar-46377919-5.0

[CSDiag] Verify that @autoclosure param has function type before casting

Author: AnnaZaks

lib/Sema/CSDiag.cpp

@@ -3056,9 +3056,13 @@ typeCheckArgumentChildIndependently(Expr *argExpr, Type argType,
         // Look at each of the arguments assigned to this parameter.
         auto currentParamType = param.getOldType();
 
-        if (param.isAutoClosure())
-          currentParamType =
-              currentParamType->castTo<FunctionType>()->getResult();
+        // Since this is diagnostics, let's make sure that parameter
+        // marked as @autoclosure indeed has a function type, because
+        // it can also be an error type and possibly unresolved type.
+        if (param.isAutoClosure()) {
+          if (auto *funcType = currentParamType->getAs<FunctionType>())
+            currentParamType = funcType->getResult();
+        }
 
         for (auto inArgNo : paramBindings[paramIdx]) {
           // Determine the argument type.

test/Constraints/rdar46377919.swift

@@ -0,0 +1,13 @@
+// RUN: %target-typecheck-verify-swift
+
+class Foo {
+  init(lhs: @autoclosure () -> Int,
+       rhs: @autoclosure () -> Undefined) {
+     // expected-error@-1 {{use of undeclared type 'Undefined'}}
+  }
+}
+
+func foo() -> Foo {
+  return Foo(lhs: 2, rhs: 2)
+  // expected-error@-1 {{cannot convert value of type 'Int' to expected argument type '<<error type>>'}}
+}