AST: Fix rendering of available ranges in AvailabilityContext::print().

Author: tshortli

lib/AST/AvailabilityContext.cpp

@@ -403,12 +403,35 @@ void AvailabilityContext::print(llvm::raw_ostream &os) const {
   os << "version=" << stringForAvailability(getPlatformRange());
 
   auto domainInfos = storage->getDomainInfos();
-  if (domainInfos.size() > 0) {
-    os << " unavailable=";
-    llvm::interleave(
-        domainInfos, os,
-        [&](const DomainInfo &domainInfo) { domainInfo.getDomain().print(os); },
-        ",");
+  if (!domainInfos.empty()) {
+    auto availableInfos = llvm::make_filter_range(
+        domainInfos, [](auto info) { return !info.isUnavailable(); });
+
+    if (!availableInfos.empty()) {
+      os << " available=";
+      llvm::interleave(
+          availableInfos, os,
+          [&](const DomainInfo &domainInfo) {
+            domainInfo.getDomain().print(os);
+            if (domainInfo.getDomain().isVersioned() &&
+                domainInfo.getRange().hasMinimumVersion())
+              os << ">=" << domainInfo.getRange().getAsString();
+          },
+          ",");
+    }
+
+    auto unavailableInfos = llvm::make_filter_range(
+        domainInfos, [](auto info) { return info.isUnavailable(); });
+
+    if (!unavailableInfos.empty()) {
+      os << " unavailable=";
+      llvm::interleave(
+          unavailableInfos, os,
+          [&](const DomainInfo &domainInfo) {
+            domainInfo.getDomain().print(os);
+          },
+          ",");
+    }
   }
 
   if (isDeprecated())

test/Sema/availability_scopes_custom_domains.swift

@@ -0,0 +1,27 @@
+// RUN:  %target-swift-frontend -typecheck %s \
+// RUN:  -enable-experimental-feature CustomAvailability \
+// RUN:  -define-enabled-availability-domain A \
+// RUN:  -define-enabled-availability-domain B \
+// RUN:  -dump-availability-scopes > %t.dump 2>&1
+// RUN: %FileCheck --strict-whitespace %s < %t.dump
+
+// REQUIRES: swift_feature_CustomAvailability
+
+// CHECK: {{^}}(root version={{.*}}
+// CHECK: {{^}}  (decl version={{.*}} available=A decl=availableInA()
+@available(A)
+func availableInA() { }
+
+// CHECK: {{^}}  (decl version={{.*}} unavailable=A decl=unavailableInA()
+@available(A, unavailable)
+func unavailableInA() { }
+
+// CHECK: {{^}}  (decl version={{.*}} available=A,B decl=availableInAB()
+@available(A)
+@available(B)
+func availableInAB() { }
+
+// FIXME: [availability] Should be "available=A"
+// CHECK: {{^}}  (decl version={{.*}} deprecated decl=deprecatedInA()
+@available(A, deprecated)
+func deprecatedInA() { }