AST/Parse: Assorted availability spec fixes

lib/AST/ASTDumper.cpp

@@ -1102,40 +1102,19 @@ namespace {
     void printRec(AvailabilitySpec *Spec, Label label) {
       printRecArbitrary(
           [&](Label label) {
-            switch (Spec->getKind()) {
-            case AvailabilitySpecKind::PlatformVersionConstraint: {
-              printHead("platform_version_constraint_availability_spec",
-                        PatternColor, label);
-              printField(platformString(Spec->getPlatform()),
-                         Label::always("platform"));
+            printHead("availability_spec", PatternColor, label);
+            StringRef domainName =
+                Spec->isWildcard()
+                    ? "*"
+                    : Spec->getDomain()->getNameForAttributePrinting();
+            printField(domainName, Label::always("domain"));
+            if (!Spec->getVersion().empty())
               printFieldRaw(
                   [&](llvm::raw_ostream &OS) { OS << Spec->getVersion(); },
                   Label::always("version"));
-              printFoot();
-              break;
-            }
-            case AvailabilitySpecKind::LanguageVersionConstraint:
-            case AvailabilitySpecKind::PackageDescriptionVersionConstraint: {
-              printHead("platform_agnostic_version_constraint_"
-                        "availability_spec",
-                        PatternColor, label);
-              printField(Spec->getDomain()->isSwiftLanguage()
-                             ? "swift"
-                             : "package_description",
-                         Label::always("kind"));
-              printFieldRaw(
-                  [&](llvm::raw_ostream &OS) { OS << Spec->getVersion(); },
-                  Label::always("version"));
-              printFoot();
-              break;
-            }
-            case AvailabilitySpecKind::Wildcard:
-              printHead("wildcard_constraint_availability_spec", PatternColor,
-                        label);
-              printFoot();
-              break;
-            }
-          }, label);
+            printFoot();
+          },
+          label);
     }
 
     /// Print a range of nodes as a single "array" child node.

lib/AST/Decl.cpp

@@ -6671,10 +6671,9 @@ bool EnumDecl::hasOnlyCasesWithoutAssociatedValues() const {
   bool hasAssociatedValues = false;
 
   for (auto elt : getAllElements()) {
-    for (auto Attr : elt->getSemanticAvailableAttrs()) {
-      // FIXME: [availability] Deprecation doesn't make an element unavailable
+    // FIXME: [availability] Deprecation doesn't make an element unavailable
+    if (!elt->getSemanticAvailableAttrs().empty())
       hasAnyUnavailableValues = true;
-    }
 
     if (!elt->isAvailableDuringLowering())
       hasAnyUnavailableDuringLoweringValues = true;

lib/Parse/ParseStmt.cpp

@@ -1542,9 +1542,7 @@ Parser::parseAvailabilitySpecList(SmallVectorImpl<AvailabilitySpec *> &Specs,
           // If this was preceded by a single platform version constraint, we
           // can guess that the intention was to treat it as 'introduced' and
           // suggest a fix-it to combine them.
-          if (Specs.size() == 1 &&
-              Previous->getPlatform() != PlatformKind::none &&
-              Text != "introduced") {
+          if (Specs.size() == 1 && Text != "introduced") {
             auto PlatformNameEndLoc = Lexer::getLocForEndOfToken(
                 SourceManager, Previous->getStartLoc());
 

test/Parse/diagnose_availability.swift

@@ -64,6 +64,12 @@ func swiftDeprecatedObsoleted() {}
 // expected-warning@-1 {{expected 'introduced', 'deprecated', or 'obsoleted' in 'available' attribute for platform 'swift'}}
 func swiftMessage() {}
 
+@available(swift 5, deprecated: 6)
+// expected-error@-1 {{'deprecated' can't be combined with shorthand specification 'swift 5'}}
+// expected-note@-2 {{did you mean to specify an introduction version?}} {{17-17=, introduced:}}
+// expected-error@-3 {{expected declaration}}
+func swiftShorthandFollowedByDeprecated() {}
+
 @available(*, unavailable, message: "\("message")")
 // expected-error@-1{{'message' cannot be an interpolated string literal}}
 func interpolatedMessage() {}

test/attr/attr_availability_swiftpm_v4.swift

@@ -79,3 +79,10 @@ unconditionallyRenamed() // expected-error {{'unconditionallyRenamed()' has been
 func unconditionallyRenamedAndIntroducedLater() {} // expected-note {{'unconditionallyRenamedAndIntroducedLater()' has been explicitly marked unavailable here}}
 
 unconditionallyRenamedAndIntroducedLater() // expected-error {{'unconditionallyRenamedAndIntroducedLater()' has been renamed to 'shortFour'}}
+
+func testQuery() {
+  if #available(_PackageDescription 4.0) { // expected-error {{PackageDescription version checks not allowed in #available(...)}}
+    // expected-error@-1 {{condition required for target platform}}
+    shortFourPointOh()
+  }
+}