AST: #if hasAttribute(retroactive) should evaluate true

include/swift/AST/Attr.h

@@ -3022,6 +3022,9 @@ class alignas(1 << AttrAlignInBits) TypeAttribute
   /// corresponds to it.
   static std::optional<TypeAttrKind> getAttrKindFromString(StringRef Str);
 
+  /// Returns true if type attributes of the given kind only appear in SIL.
+  static bool isSilOnly(TypeAttrKind TK);
+
   /// Return the name (like "autoclosure") for an attribute ID.
   static const char *getAttrName(TypeAttrKind kind);
 

lib/AST/Attr.cpp

@@ -124,6 +124,16 @@ TypeAttribute::getAttrKindFromString(StringRef Str) {
       .Default(std::nullopt);
 }
 
+bool TypeAttribute::isSilOnly(TypeAttrKind TK) {
+  switch (TK) {
+#define SIL_TYPE_ATTR(X, C) case TypeAttrKind::C:
+#include "swift/AST/TypeAttr.def"
+    return true;
+  default:
+    return false;
+  }
+}
+
 /// Return the name (like "autoclosure") for an attribute ID.
 const char *TypeAttribute::getAttrName(TypeAttrKind kind) {
   switch (kind) {
@@ -2947,8 +2957,8 @@ void swift::simple_display(llvm::raw_ostream &out, const DeclAttribute *attr) {
     attr->print(out);
 }
 
-bool swift::hasAttribute(
-    const LangOptions &langOpts, llvm::StringRef attributeName) {
+static bool hasDeclAttribute(const LangOptions &langOpts,
+                             llvm::StringRef attributeName) {
   std::optional<DeclAttrKind> kind =
       DeclAttribute::getAttrKindFromString(attributeName);
   if (!kind)
@@ -2967,3 +2977,27 @@ bool swift::hasAttribute(
 
   return true;
 }
+
+static bool hasTypeAttribute(const LangOptions &langOpts,
+                             llvm::StringRef attributeName) {
+  std::optional<TypeAttrKind> kind =
+      TypeAttribute::getAttrKindFromString(attributeName);
+  if (!kind)
+    return false;
+
+  if (TypeAttribute::isSilOnly(*kind))
+    return false;
+
+  return true;
+}
+
+bool swift::hasAttribute(const LangOptions &langOpts,
+                         llvm::StringRef attributeName) {
+  if (hasDeclAttribute(langOpts, attributeName))
+    return true;
+
+  if (hasTypeAttribute(langOpts, attributeName))
+    return true;
+
+  return false;
+}

test/attr/has_attribute.swift

@@ -23,3 +23,23 @@ UserInaccessibleAreNotAttributes
 #if hasAttribute(17)
 // expected-error@-1:18 {{unexpected platform condition argument: expected attribute name}}
 #endif
+
+#if !hasAttribute(escaping)
+#error("type attributes are valid")
+#endif
+
+#if !hasAttribute(convention)
+#error("type attributes are valid")
+#endif
+
+#if !hasAttribute(retroactive)
+#error("type attributes are valid")
+#endif
+
+#if hasAttribute(in_guaranteed)
+#error("SIL type attributes are invalid")
+#endif
+
+#if hasAttribute(opened)
+#error("SIL type attributes are invalid")
+#endif