SymbolGraphGen: Adopt SemanticAvailableAttr.

Author: tshortli

lib/SymbolGraphGen/AvailabilityMixin.cpp

@@ -18,23 +18,15 @@ using namespace swift;
 using namespace symbolgraphgen;
 
 namespace {
-StringRef getDomain(const AvailableAttr &AvAttr) {
-  switch (AvAttr.getPlatformAgnosticAvailability()) {
-    // SPM- and Swift-specific availability.
-    case PlatformAgnosticAvailabilityKind::PackageDescriptionVersionSpecific:
-      return { "SwiftPM" };
-    case PlatformAgnosticAvailabilityKind::SwiftVersionSpecific:
-    case PlatformAgnosticAvailabilityKind::UnavailableInSwift:
-      return { "Swift" };
-    // Although these are in the agnostic kinds, they are actually a signal
-    // that there is either platform-specific or completely platform-agnostic.
-    // They'll be handled below.
-    case PlatformAgnosticAvailabilityKind::Deprecated:
-    case PlatformAgnosticAvailabilityKind::Unavailable:
-    case PlatformAgnosticAvailabilityKind::None:
-    case PlatformAgnosticAvailabilityKind::NoAsync:
-      break;
-  }
+StringRef getDomain(const SemanticAvailableAttr &AvAttr) {
+  // FIXME: [avalailability] Move the definition of these strings into
+  // AvailabilityDomain so that new domains are handled automatically.
+
+  if (AvAttr.getDomain().isPackageDescription())
+    return { "SwiftPM" };
+
+  if (AvAttr.getDomain().isSwiftLanguage())
+    return { "Swift" };
 
   // Platform-specific availability.
   switch (AvAttr.getPlatform()) {
@@ -73,16 +65,13 @@ StringRef getDomain(const AvailableAttr &AvAttr) {
 }
 } // end anonymous namespace
 
-Availability::Availability(const AvailableAttr &AvAttr)
-  : Domain(getDomain(AvAttr)),
-    Introduced(AvAttr.Introduced),
-    Deprecated(AvAttr.Deprecated),
-    Obsoleted(AvAttr.Obsoleted),
-    Message(AvAttr.Message),
-    Renamed(AvAttr.Rename),
-    IsUnconditionallyDeprecated(AvAttr.isUnconditionallyDeprecated()),
-    IsUnconditionallyUnavailable(AvAttr.isUnconditionallyUnavailable()) {
-      assert(!Domain.empty());
+Availability::Availability(const SemanticAvailableAttr &AvAttr)
+    : Domain(getDomain(AvAttr)), Introduced(AvAttr.getIntroduced()),
+      Deprecated(AvAttr.getDeprecated()), Obsoleted(AvAttr.getObsoleted()),
+      Message(AvAttr.getMessage()), Renamed(AvAttr.getRename()),
+      IsUnconditionallyDeprecated(AvAttr.isUnconditionallyDeprecated()),
+      IsUnconditionallyUnavailable(AvAttr.isUnconditionallyUnavailable()) {
+  assert(!Domain.empty());
 }
 
 void

lib/SymbolGraphGen/AvailabilityMixin.h

@@ -49,7 +49,7 @@ struct Availability {
   /// If \c true, is unconditionally unavailable in this \c Domain.
   bool IsUnconditionallyUnavailable;
 
-  Availability(const AvailableAttr &AvAttr);
+  Availability(const SemanticAvailableAttr &AvAttr);
 
   /// Update this availability from a duplicate @available
   /// attribute with the same platform on the same declaration.

lib/SymbolGraphGen/Symbol.cpp

@@ -637,17 +637,15 @@ void getAvailabilities(const Decl *D,
                        bool IsParent) {
   // DeclAttributes is a linked list in reverse order from where they
   // appeared in the source. Let's re-reverse them.
-  SmallVector<const AvailableAttr *, 4> AvAttrs;
-  for (const auto *Attr : D->getAttrs()) {
-    if (const auto *AvAttr = dyn_cast<AvailableAttr>(Attr)) {
-      AvAttrs.push_back(AvAttr);
-    }
+  SmallVector<SemanticAvailableAttr, 4> AvAttrs;
+  for (auto Attr : D->getSemanticAvailableAttrs(/*includeInactive=*/true)) {
+    AvAttrs.push_back(Attr);
   }
   std::reverse(AvAttrs.begin(), AvAttrs.end());
 
   // Now go through them in source order.
-  for (auto *AvAttr : AvAttrs) {
-    Availability NewAvailability(*AvAttr);
+  for (auto AvAttr : AvAttrs) {
+    Availability NewAvailability(AvAttr);
     if (NewAvailability.empty()) {
       continue;
     }