WIP

Author: tshortli

lib/AST/AvailabilitySpec.cpp

@@ -29,22 +29,32 @@ AvailabilitySpec *AvailabilitySpec::createWildcard(ASTContext &ctx,
                                     /*VersionStartLoc=*/{});
 }
 
+static SourceRange getSpecSourceRange(SourceLoc domainLoc,
+                                      SourceRange versionRange) {
+  if (domainLoc.isInvalid())
+    return SourceRange();
+
+  if (versionRange.isValid())
+    return SourceRange(domainLoc, versionRange.End);
+
+  return SourceRange(domainLoc);
+}
+
 AvailabilitySpec *AvailabilitySpec::createForDomain(ASTContext &ctx,
                                                     AvailabilityDomain domain,
                                                     SourceLoc loc,
                                                     llvm::VersionTuple version,
                                                     SourceRange versionRange) {
-  DEBUG_ASSERT(!version.empty());
-  return new (ctx) AvailabilitySpec(domain, SourceRange(loc, versionRange.End),
-                                    version, versionRange.Start);
+  return new (ctx)
+      AvailabilitySpec(domain, getSpecSourceRange(loc, versionRange), version,
+                       versionRange.Start);
 }
 
 AvailabilitySpec *AvailabilitySpec::createForDomainIdentifier(
     ASTContext &ctx, Identifier domainIdentifier, SourceLoc loc,
     llvm::VersionTuple version, SourceRange versionRange) {
-  DEBUG_ASSERT(!version.empty());
   return new (ctx)
-      AvailabilitySpec(domainIdentifier, SourceRange(loc, versionRange.End),
+      AvailabilitySpec(domainIdentifier, getSpecSourceRange(loc, versionRange),
                        version, versionRange.Start);
 }
 

lib/Parse/ParseExpr.cpp

@@ -3715,9 +3715,11 @@ ParserResult<AvailabilitySpec> Parser::parseAvailabilitySpec() {
   llvm::VersionTuple Version;
   SourceRange VersionRange;
 
-  if (parseVersionTuple(Version, VersionRange,
-                        diag::avail_query_expected_version_number)) {
-    return nullptr;
+  if (Tok.isAny(tok::integer_literal, tok::floating_literal)) {
+    if (parseVersionTuple(Version, VersionRange,
+                          diag::avail_query_expected_version_number)) {
+      return nullptr;
+    }
   }
 
   return makeParserResult(AvailabilitySpec::createForDomainIdentifier(

test/attr/attr_availability_custom_domains.swift

@@ -38,4 +38,16 @@ func test() {
   deprecatedInRedefinedDomain() // expected-warning {{'deprecatedInRedefinedDomain()' is deprecated: Use something else}}
   availableInDynamicDomain() // FIXME: [availability] should be diagnosed
   availableInUnknownDomain() // Ok
+
+  if #available(EnabledDomain) {}
+  if #available(RedefinedDomain) {}
+  if #available(DisabledDomain) {}
+  if #available(DynamicDomain) {}
+  if #available(UnknownDomain) {} // expected-warning {{unrecognized platform name 'UnknownDomain'}}
+
+  if #unavailable(EnabledDomain) {}
+  if #unavailable(RedefinedDomain) {}
+  if #unavailable(DisabledDomain) {}
+  if #unavailable(DynamicDomain) {}
+  if #unavailable(UnknownDomain) {} // expected-warning {{unrecognized platform name 'UnknownDomain'}}
 }

test/attr/attr_availability_custom_domains_experimental_feature_required.swift

@@ -3,3 +3,6 @@
 
 @available(SomeDomain, unavailable) // expected-error {{'SomeDomain' requires -enable-experimental-feature CustomAvailability}}
 func availableInSomeDomain() { }
+
+if #available(SomeDomain) {} // expected-error {{'SomeDomain' requires -enable-experimental-feature CustomAvailability}}
+if #unavailable(SomeDomain) {} // expected-error {{'SomeDomain' requires -enable-experimental-feature CustomAvailability}}