AST: Teach DiagnosticEngine to accept AvailabilityRange arguments.

Author: tshortli

include/swift/AST/ASTBridging.h

@@ -514,7 +514,7 @@ enum ENUM_EXTENSIBILITY_ATTR(open) BridgedDiagID : uint32_t {
 };
 
 class BridgedDiagnosticArgument {
-  int64_t storage[3];
+  int64_t storage[4];
 
 public:
   BRIDGED_INLINE BridgedDiagnosticArgument(const swift::DiagnosticArgument &arg);

include/swift/AST/DiagnosticEngine.h

@@ -146,6 +146,7 @@ namespace swift {
     DescriptiveStmtKind,
     DeclAttribute,
     AvailabilityDomain,
+    AvailabilityRange,
     VersionTuple,
     LayoutConstraint,
     ActorIsolation,
@@ -184,6 +185,7 @@ namespace swift {
       StmtKind DescriptiveStmtKindVal;
       const DeclAttribute *DeclAttributeVal;
       AvailabilityDomain AvailabilityDomainVal;
+      AvailabilityRange AvailabilityRangeVal;
       llvm::VersionTuple VersionVal;
       LayoutConstraint LayoutConstraintVal;
       ActorIsolation ActorIsolationVal;
@@ -288,6 +290,10 @@ namespace swift {
         : Kind(DiagnosticArgumentKind::AvailabilityDomain),
           AvailabilityDomainVal(domain) {}
 
+    DiagnosticArgument(const AvailabilityRange &range)
+        : Kind(DiagnosticArgumentKind::AvailabilityRange),
+          AvailabilityRangeVal(range) {}
+
     DiagnosticArgument(llvm::VersionTuple version)
       : Kind(DiagnosticArgumentKind::VersionTuple),
         VersionVal(version) { }
@@ -418,6 +424,11 @@ namespace swift {
       return AvailabilityDomainVal;
     }
 
+    const AvailabilityRange getAsAvailabilityRange() const {
+      assert(Kind == DiagnosticArgumentKind::AvailabilityRange);
+      return AvailabilityRangeVal;
+    }
+
     llvm::VersionTuple getAsVersionTuple() const {
       assert(Kind == DiagnosticArgumentKind::VersionTuple);
       return VersionVal;

lib/AST/DiagnosticEngine.cpp

@@ -1063,6 +1063,11 @@ static void formatDiagnosticArgument(StringRef Modifier,
            "Improper modifier for AvailabilityDomain argument");
     Out << Arg.getAsAvailabilityDomain().getNameForDiagnostics();
     break;
+  case DiagnosticArgumentKind::AvailabilityRange:
+    assert(Modifier.empty() &&
+           "Improper modifier for AvailabilityRange argument");
+    Out << Arg.getAsAvailabilityRange().getRawMinimumVersion().getAsString();
+    break;
   case DiagnosticArgumentKind::VersionTuple:
     assert(Modifier.empty() &&
            "Improper modifier for VersionTuple argument");