[ASTPrinter] Mark declarations with runtime attributes as using the feature

Author: xedin

lib/AST/ASTPrinter.cpp

@@ -2963,7 +2963,13 @@ static bool usesFeatureTypeWrappers(Decl *decl) {
 }
 
 static bool usesFeatureRuntimeDiscoverableAttrs(Decl *decl) {
-  return decl->getAttrs().hasAttribute<RuntimeMetadataAttr>();
+  if (decl->getAttrs().hasAttribute<RuntimeMetadataAttr>())
+    return true;
+
+  if (auto *VD = dyn_cast<ValueDecl>(decl))
+    return !VD->getRuntimeDiscoverableAttrs().empty();
+
+  return false;
 }
 
 static bool usesFeatureParserRoundTrip(Decl *decl) {

lib/AST/Decl.cpp

@@ -9702,3 +9702,10 @@ ValueDecl::getRuntimeDiscoverableAttrTypeDecl(CustomAttr *attr) const {
   assert(nominal->getAttrs().hasAttribute<RuntimeMetadataAttr>());
   return nominal;
 }
+
+ArrayRef<CustomAttr *> ValueDecl::getRuntimeDiscoverableAttrs() const {
+  auto *mutableSelf = const_cast<ValueDecl *>(this);
+  return evaluateOrDefault(getASTContext().evaluator,
+                           GetRuntimeDiscoverableAttributes{mutableSelf},
+                           nullptr);
+}

lib/Sema/TypeCheckRuntimeMetadataAttr.cpp

@@ -29,13 +29,6 @@
 using namespace swift;
 using namespace constraints;
 
-ArrayRef<CustomAttr *> ValueDecl::getRuntimeDiscoverableAttrs() const {
-  auto *mutableSelf = const_cast<ValueDecl *>(this);
-  return evaluateOrDefault(getASTContext().evaluator,
-                           GetRuntimeDiscoverableAttributes{mutableSelf},
-                           nullptr);
-}
-
 std::pair<BraceStmt *, Type>
 ValueDecl::getRuntimeDiscoverableAttributeGenerator(CustomAttr *attr) const {
   auto *mutableSelf = const_cast<ValueDecl *>(this);