Merge pull request #22186 from xedin/rdar-47586626

[TypeChecker] Drop @autoclosure attribute from invalid parameters

Author: xedin

lib/Parse/ParsePattern.cpp

@@ -489,6 +489,10 @@ mapParsedParameters(Parser &parser,
       // belongs to both type flags and declaration.
       if (auto *ATR = dyn_cast<AttributedTypeRepr>(type)) {
         auto &attrs = ATR->getAttrs();
+        // At this point we actually don't know if that's valid to mark
+        // this parameter declaration as `autoclosure` because type has
+        // not been resolved yet - it should either be a function type
+        // or typealias with underlying function type.
         param->setAutoClosure(attrs.has(TypeAttrKind::TAK_autoclosure));
       }
     } else if (paramContext != Parser::ParameterContextKind::Closure) {

lib/Sema/TypeCheckPattern.cpp

@@ -773,6 +773,13 @@ static bool validateParameterType(ParamDecl *decl, TypeResolution resolution,
     }
   }
 
+  // If this parameter declaration is marked as `@autoclosure`
+  // let's make sure that its parameter type is indeed a function,
+  // this decision couldn't be made based on type representative
+  // alone because it may be later resolved into an invalid type.
+  if (decl->isAutoClosure())
+    hadError |= !(Ty && Ty->is<FunctionType>());
+
   if (hadError)
     TL.setInvalidType(TC.Context);
 

lib/Sema/TypeCheckType.cpp

@@ -2293,10 +2293,6 @@ bool TypeResolver::resolveASTFunctionTypeParams(
       variadic = true;
     }
 
-    bool autoclosure = false;
-    if (auto *ATR = dyn_cast<AttributedTypeRepr>(eltTypeRepr))
-      autoclosure = ATR->getAttrs().has(TAK_autoclosure);
-
     Type ty = resolveType(eltTypeRepr, thisElementOptions);
     if (!ty) return true;
 
@@ -2310,6 +2306,16 @@ bool TypeResolver::resolveASTFunctionTypeParams(
       ty = ty->mapTypeOutOfContext();
     }
 
+    bool autoclosure = false;
+    if (auto *ATR = dyn_cast<AttributedTypeRepr>(eltTypeRepr)) {
+      // Make sure that parameter itself is of a function type, otherwise
+      // the problem would already be diagnosed by `resolveAttributedType`
+      // but attributes would stay unchanged. So as a recovery let's drop
+      // 'autoclosure' attribute from the resolved parameter.
+      autoclosure =
+          ty->is<FunctionType>() && ATR->getAttrs().has(TAK_autoclosure);
+    }
+
     ValueOwnership ownership;
 
     auto *nestedRepr = eltTypeRepr;

test/attr/attr_autoclosure.swift

@@ -245,3 +245,16 @@ class Bar {
   typealias BarClosure = (String) -> String
   func barFunction(closure: @autoclosure BarClosure) {} // expected-error {{argument type of @autoclosure parameter must be '()'}}
 }
+
+func rdar_47586626() {
+  struct S {}
+  typealias F = () -> S
+
+  func foo(_: @autoclosure S) {} // expected-error {{@autoclosure attribute only applies to function types}}
+  func bar(_: @autoclosure F) {} // Ok
+
+  let s = S()
+
+  foo(s) // ok
+  bar(s) // ok
+}