AST: Make $UnavailableFromAsync and $NoAsyncAvailability baseline features.

They have been available since at least Swift 5.8.

Author: tshortli

include/swift/Basic/Features.def

@@ -147,8 +147,8 @@ BASELINE_LANGUAGE_FEATURE(BuiltinAssumeAlignment, 0, "Builtin.assumeAlignment")
 BASELINE_LANGUAGE_FEATURE(BuiltinCreateTaskGroupWithFlags, 0, "Builtin.createTaskGroupWithFlags")
 BASELINE_LANGUAGE_FEATURE(UnsafeInheritExecutor, 0, "@_unsafeInheritExecutor")
 SUPPRESSIBLE_LANGUAGE_FEATURE(PrimaryAssociatedTypes2, 346, "Primary associated types")
-SUPPRESSIBLE_LANGUAGE_FEATURE(UnavailableFromAsync, 0, "@_unavailableFromAsync")
-SUPPRESSIBLE_LANGUAGE_FEATURE(NoAsyncAvailability, 340, "@available(*, noasync)")
+BASELINE_LANGUAGE_FEATURE(UnavailableFromAsync, 0, "@_unavailableFromAsync")
+BASELINE_LANGUAGE_FEATURE(NoAsyncAvailability, 340, "@available(*, noasync)")
 SUPPRESSIBLE_LANGUAGE_FEATURE(AssociatedTypeAvailability, 0, "Availability on associated types")
 SUPPRESSIBLE_LANGUAGE_FEATURE(AsyncSequenceFailure, 0, "Failure associated type on AsyncSequence and AsyncIteratorProtocol")
 BASELINE_LANGUAGE_FEATURE(BuiltinIntLiteralAccessors, 368, "Builtin.IntLiteral accessors")

lib/AST/ASTPrinter.cpp

@@ -3035,15 +3035,6 @@ static void suppressingFeaturePrimaryAssociatedTypes2(PrintOptions &options,
   options.PrintPrimaryAssociatedTypes = originalPrintPrimaryAssociatedTypes;
 }
 
-static void
-suppressingFeatureUnavailableFromAsync(PrintOptions &options,
-                                       llvm::function_ref<void()> action) {
-  unsigned originalExcludeAttrCount = options.ExcludeAttrList.size();
-  options.ExcludeAttrList.push_back(DeclAttrKind::UnavailableFromAsync);
-  action();
-  options.ExcludeAttrList.resize(originalExcludeAttrCount);
-}
-
 static void
 suppressingFeatureAssociatedTypeAvailability(
     PrintOptions &options, llvm::function_ref<void()> action) {
@@ -3070,14 +3061,6 @@ suppressingFeatureLexicalLifetimes(PrintOptions &options,
   options.ExcludeAttrList.resize(originalExcludeAttrCount);
 }
 
-static void
-suppressingFeatureNoAsyncAvailability(PrintOptions &options,
-                                      llvm::function_ref<void()> action) {
-  llvm::SaveAndRestore<PrintOptions> originalOptions(options);
-  options.SuppressNoAsyncAvailabilityAttr = true;
-  action();
-}
-
 static void suppressingFeatureRetroactiveAttribute(
   PrintOptions &options,
   llvm::function_ref<void()> action) {

lib/AST/FeatureSet.cpp

@@ -210,14 +210,6 @@ static bool usesFeaturePrimaryAssociatedTypes2(Decl *decl) {
   return false;
 }
 
-static bool usesFeatureUnavailableFromAsync(Decl *decl) {
-  return decl->getAttrs().hasAttribute<UnavailableFromAsyncAttr>();
-}
-
-static bool usesFeatureNoAsyncAvailability(Decl *decl) {
-  return decl->getAttrs().getNoAsync(decl->getASTContext()) != nullptr;
-}
-
 static bool usesFeatureAssociatedTypeAvailability(Decl *decl) {
   return isa<AssociatedTypeDecl>(decl) &&
          decl->getAttrs().hasAttribute<AvailableAttr>();

test/ModuleInterface/features.swift

@@ -9,6 +9,8 @@
 // RUN:   --implicit-check-not "\$Sendable" \
 // RUN:   --implicit-check-not "\$InheritActorContext" \
 // RUN:   --implicit-check-not "\$UnsafeInheritExecutor" \
+// RUN:   --implicit-check-not "\$NoAsyncAvailability" \
+// RUN:   --implicit-check-not "\$UnavailableFromAsync" \
 // RUN:   < %t/FeatureTest.swiftinterface
 
 // REQUIRES: concurrency
@@ -146,20 +148,12 @@ public func unsafeInheritExecutor() async {}
 @_specialize(exported: true, availability: SwiftStdlib 5.1, *; where T == Int)
 public func unsafeInheritExecutorAndSpecialize<T>(value: T) async {}
 
-// CHECK:      #if compiler(>=5.3) && $UnavailableFromAsync
-// CHECK-NEXT: @_unavailableFromAsync(message: "Test") public func unavailableFromAsyncFunc()
-// CHECK-NEXT: #else
-// CHECK-NEXT: public func unavailableFromAsyncFunc()
-// CHECK-NEXT: #endif
+// CHECK:       @_unavailableFromAsync(message: "Test") public func unavailableFromAsyncFunc()
 @_unavailableFromAsync(message: "Test")
 public func unavailableFromAsyncFunc() { }
 
-// CHECK:      #if compiler(>=5.3) && $NoAsyncAvailability
-// CHECK-NEXT: @available(*, noasync, message: "Test")
+// CHECK:      @available(*, noasync, message: "Test")
 // CHECK-NEXT: public func noAsyncFunc()
-// CHECK-NEXT: #else
-// CHECK-NEXT: public func noAsyncFunc()
-// CHECK-NEXT: #endif
 @available(*, noasync, message: "Test")
 public func noAsyncFunc() { }