[AST] Demote @noescape and @async to SIL attributes

These aren't currently claimed by anything other
than SILFunctions, and as such are invalid in
regular Swift code. Treat them as SIL type
attributes. Also while here, fix the SIL reference
attributes to be SIL attributes.

Author: hamishknight

include/swift/AST/TypeAttr.def

@@ -53,11 +53,9 @@
 // Type attributes
 SIMPLE_TYPE_ATTR(autoclosure, Autoclosure)
 TYPE_ATTR(convention, Convention)
-SIMPLE_TYPE_ATTR(noescape, NoEscape)
 SIMPLE_TYPE_ATTR(escaping, Escaping)
 TYPE_ATTR(differentiable, Differentiable)
 SIMPLE_TYPE_ATTR(noDerivative, NoDerivative)
-SIMPLE_TYPE_ATTR(async, Async)
 SIMPLE_TYPE_ATTR(Sendable, Sendable)
 SIMPLE_TYPE_ATTR(retroactive, Retroactive)
 SIMPLE_TYPE_ATTR(unchecked, Unchecked)
@@ -68,10 +66,11 @@ TYPE_ATTR(_opaqueReturnTypeOf, OpaqueReturnTypeOf)
 TYPE_ATTR(isolated, Isolated)
 
 // SIL-specific attributes
+SIMPLE_SIL_TYPE_ATTR(async, Async)
 SIMPLE_SIL_TYPE_ATTR(block_storage, BlockStorage)
 SIMPLE_SIL_TYPE_ATTR(box, Box)
 SIMPLE_SIL_TYPE_ATTR(dynamic_self, DynamicSelf)
-#define REF_STORAGE(Name, name, ...) SIMPLE_TYPE_ATTR(sil_##name, SIL##Name)
+#define REF_STORAGE(Name, name, ...) SIMPLE_SIL_TYPE_ATTR(sil_##name, SIL##Name)
 #include "swift/AST/ReferenceStorage.def"
 SIMPLE_SIL_TYPE_ATTR(error, Error)
 SIMPLE_SIL_TYPE_ATTR(error_indirect, ErrorIndirect)
@@ -83,6 +82,7 @@ SIMPLE_SIL_TYPE_ATTR(inout, Inout)
 SIMPLE_SIL_TYPE_ATTR(inout_aliasable, InoutAliasable)
 SIMPLE_SIL_TYPE_ATTR(in_guaranteed, InGuaranteed)
 SIMPLE_SIL_TYPE_ATTR(in_constant, InConstant)
+SIMPLE_SIL_TYPE_ATTR(noescape, NoEscape)
 SIMPLE_SIL_TYPE_ATTR(pack_owned, PackOwned)
 SIMPLE_SIL_TYPE_ATTR(pack_guaranteed, PackGuaranteed)
 SIMPLE_SIL_TYPE_ATTR(pack_inout, PackInout)

lib/Sema/TypeCheckType.cpp

@@ -3116,7 +3116,6 @@ static bool isSILAttribute(TypeAttrKind attrKind) {
   switch (attrKind) {
 #define SIL_TYPE_ATTR(SPELLING, CLASS) case TypeAttrKind::CLASS:
 #include "swift/AST/TypeAttr.def"
-  case TypeAttrKind::NoEscape: // noescape is only used in SIL now
     return true;
 
   default: