Addressing CR comments

Author: LucianoPAlmeida

include/swift/AST/DiagnosticsSema.def

@@ -2682,7 +2682,7 @@ ERROR(autoclosure_function_type,none,
       ())
 
 ERROR(invalid_autoclosure_and_convention_attributes,none,
-      "@convention(%0) attribute is not allowed on @autoclosure type",
+      "'@convention(%0)' attribute is not allowed on '@autoclosure' types",
       (StringRef))
 
 ERROR(autoclosure_function_input_nonunit,none,

lib/Sema/TypeCheckType.cpp

@@ -2256,16 +2256,18 @@ Type TypeResolver::resolveAttributedType(TypeAttributes &attrs,
                    attrs.getConvention());
           rep = FunctionType::Representation::Swift;
         } else {
-          auto convention = attrs.getConvention();
+          rep = *parsedRep;
+          
           if (attrs.has(TAK_autoclosure)) {
             // @convention(c) and @convention(block) are not allowed with an @autoclosure type.
-            if (convention == "c" || convention == "block" ) {
+            if (rep == FunctionType::Representation::CFunctionPointer ||
+                rep == FunctionType::Representation::Block) {
               diagnose(attrs.getLoc(TAK_convention),
                        diag::invalid_autoclosure_and_convention_attributes,
                        attrs.getConvention());
+              attrs.clearAttribute(TAK_autoclosure);
             }
           }
-          rep = *parsedRep;
         }
       }
 

test/attr/attr_convention.swift

@@ -9,14 +9,26 @@ let f5: @convention(INTERCAL) (Int) -> Int = { $0 } // expected-error{{conventio
 
 // SR-11027
 
-func sr11027(_ f: @convention(block) @autoclosure () -> Int) -> Void {} // expected-error {{@convention(block) attribute is not allowed on @autoclosure type}} 
+func sr11027(_ f: @convention(block) @autoclosure () -> Int) -> Void {} // expected-error {{'@convention(block)' attribute is not allowed on '@autoclosure' types}} 
 sr11027(1)
 
-func sr11027_c(_ f: @convention(c) @autoclosure () -> Int) -> Void {} // expected-error{{@convention(c) attribute is not allowed on @autoclosure type}}
+func sr11027_c(_ f: @convention(c) @autoclosure () -> Int) -> Void {} // expected-error{{'@convention(c)' attribute is not allowed on '@autoclosure' types}}
 sr11027_c(1)
 
 func sr11027_swift(_ f: @convention(swift) @autoclosure () -> Int) -> Void {} // OK
 sr11027_swift(1)
 
 func sr11027_thin(_ f: @convention(thin) @autoclosure () -> Int) -> Void {} // OK
 sr11027_thin(1)
+
+func sr11027_2(_ f: @autoclosure @convention(block) () -> Int) -> Void {} // expected-error {{'@convention(block)' attribute is not allowed on '@autoclosure' types}} 
+sr11027_2(1)
+
+func sr11027_c_2(_ f: @autoclosure @convention(c) () -> Int) -> Void {} // expected-error {{'@convention(c)' attribute is not allowed on '@autoclosure' types}} 
+sr11027_c_2(1)
+
+func sr11027_swift_2(_ f: @autoclosure @convention(swift) () -> Int) -> Void {} // OK
+sr11027_swift_2(1)
+
+func sr11027_thin_2(_ f: @autoclosure @convention(thin) () -> Int) -> Void {} // OK
+sr11027_thin_2(1)

validation-test/compiler_crashers_2_fixed/sr11027.swift

@@ -18,3 +18,15 @@ sr11027_swift(1)
 
 func sr11027_thin(_ f: @convention(thin) @autoclosure () -> Int) -> Void {} // OK
 sr11027_thin(1)
+
+func sr11027_2(_ f: @autoclosure @convention(block) () -> Int) -> Void {}
+sr11027_2(1)
+
+func sr11027_c_2(_ f: @autoclosure @convention(c) () -> Int) -> Void {}
+sr11027_c_2(1)
+
+func sr11027_swift_2(_ f: @autoclosure @convention(swift) () -> Int) -> Void {} // OK
+sr11027_swift_2(1)
+
+func sr11027_thin_2(_ f: @autoclosure @convention(thin) () -> Int) -> Void {} // OK
+sr11027_thin_2(1)