Sema: Make suppression of availability checking for types more consistent.

Availability checking for types was only suppressed when the immediate context
for the use of the type was explicitly marked unavailable. Availability is
lexical so the checking should be suppressed in the entire scope instead.

Author: tshortli

include/swift/AST/AvailabilityContext.h

@@ -66,6 +66,11 @@ class AvailabilityContext {
   /// returns `nullopt`.
   std::optional<PlatformKind> getUnavailablePlatformKind() const;
 
+  /// Returns true if this context is unavailable.
+  bool isUnavailable() const {
+    return getUnavailablePlatformKind().has_value();
+  }
+
   /// Returns true if this context is deprecated on the current platform.
   bool isDeprecated() const;
 

lib/Sema/TypeCheckAccess.cpp

@@ -2033,7 +2033,7 @@ class DeclAvailabilityChecker : public DeclVisitor<DeclAvailabilityChecker> {
 
     // If the decl which references this type is unavailable on the current
     // platform, don't diagnose the availability of the type.
-    if (AvailableAttr::isUnavailable(context))
+    if (Where.getAvailability().isUnavailable())
       return;
 
     diagnoseTypeAvailability(typeRepr, type, context->getLoc(),

test/Sema/availability_versions.swift

@@ -754,7 +754,7 @@ func classViaTypeParameter() {
 // Potentially unavailable class used in declarations
 
 class ClassWithDeclarationsOfPotentiallyUnavailableClasses {
-      // expected-note@-1 6{{add @available attribute to enclosing class}}
+      // expected-note@-1 5{{add @available attribute to enclosing class}}
 
   @available(OSX, introduced: 51)
   init() {}
@@ -808,8 +808,7 @@ class ClassWithDeclarationsOfPotentiallyUnavailableClasses {
 
   @available(OSX, unavailable)
   func unavailableMethodWithPotentiallyUnavailableLocalDeclaration() {
-    let _ : ClassAvailableOn51 = methodWithPotentiallyUnavailableReturnType() // expected-error {{'ClassAvailableOn51' is only available in macOS 51 or newer}}
-      // expected-note@-1 {{add 'if #available' version check}}
+    let _ : ClassAvailableOn51 = methodWithPotentiallyUnavailableReturnType()
   }
 }
 

test/Sema/property_wrapper_availability.swift

@@ -17,7 +17,7 @@ struct Available51Wrapper<T> {
 
 @available(*, unavailable)
 @propertyWrapper
-struct UnavailableWrapper<T> { // expected-note 8 {{'UnavailableWrapper' has been explicitly marked unavailable here}}
+struct UnavailableWrapper<T> { // expected-note 6 {{'UnavailableWrapper' has been explicitly marked unavailable here}}
   var wrappedValue: T
 }
 
@@ -77,8 +77,8 @@ struct UnavailableStruct {
   @AlwaysAvailableWrapper var alwaysAvailableExplicit: S
   @AlwaysAvailableWrapper var alwaysAvailableInferred = S()
 
-  @Available51Wrapper var available51Explicit: S  // expected-error {{'Available51Wrapper' is only available in macOS 51 or newer}}
-  @Available51Wrapper var available51Inferred = S() // expected-error {{'Available51Wrapper' is only available in macOS 51 or newer}}
+  @Available51Wrapper var available51Explicit: S
+  @Available51Wrapper var available51Inferred = S()
 
   @UnavailableWrapper var unavailableExplicit: S
   @UnavailableWrapper var unavailableInferred = S()
@@ -92,11 +92,11 @@ struct UnavailableOnMacOSStruct {
   @AlwaysAvailableWrapper var alwaysAvailableExplicit: S
   @AlwaysAvailableWrapper var alwaysAvailableInferred = S()
 
-  @Available51Wrapper var available51Explicit: S  // expected-error {{'Available51Wrapper' is only available in macOS 51 or newer}}
-  @Available51Wrapper var available51Inferred = S() // expected-error {{'Available51Wrapper' is only available in macOS 51 or newer}}
+  @Available51Wrapper var available51Explicit: S
+  @Available51Wrapper var available51Inferred = S()
 
-  @UnavailableWrapper var unavailableExplicit: S // expected-error {{'UnavailableWrapper' is unavailable}}
-  @UnavailableWrapper var unavailableInferred = S() // expected-error {{'UnavailableWrapper' is unavailable}}
+  @UnavailableWrapper var unavailableExplicit: S
+  @UnavailableWrapper var unavailableInferred = S()
 
   @WrappedValueUnavailableOnMacOS var unavailableWrappedValue: S
   @WrappedValueAvailable51 var wrappedValueAavailable51: S // expected-error {{'wrappedValue' is only available in macOS 51 or newer}}

test/attr/attr_availability_transitive_osx.swift

@@ -219,21 +219,16 @@ struct NeverAvailableContainer { // expected-note 2 {{'NeverAvailableContainer'
   let always_var: AlwaysAvailabile = always()
   let never_var: NeverAvailable = never() // expected-error {{'never()' is unavailable}}
   let osx_future_var: OSXFutureAvailable = osx_future() // expected-error {{'osx_future()' is only available in macOS 99 or newer}}
-  // expected-error@-1 {{'OSXFutureAvailable' is only available in macOS 99 or newer}}
   let osx_var: OSXUnavailable = osx() // expected-error {{'osx()' is unavailable}}
-  // expected-error@-1 {{'OSXUnavailable' is unavailable in macOS}}
   let osx_ios_var: MultiPlatformUnavailable = osx_ios() // expected-error {{'osx_ios()' is unavailable}}
-  // expected-error@-1 {{'MultiPlatformUnavailable' is unavailable in macOS}}
   let osx_extension_var: OSXAppExtensionsUnavailable = osx_extension()
 }
 
 @available(OSX, unavailable)
 struct OSXUnavailableContainer { // expected-note 2 {{'OSXUnavailableContainer' has been explicitly marked unavailable here}}
   let always_var: AlwaysAvailabile = always()
   let never_var: NeverAvailable = never() // expected-error {{'never()' is unavailable}}
-  // expected-error@-1 {{'NeverAvailable' is unavailable}}
   let osx_future_var: OSXFutureAvailable = osx_future() // expected-error {{'osx_future()' is only available in macOS 99 or newer}}
-  // expected-error@-1 {{'OSXFutureAvailable' is only available in macOS 99 or newer}}
   let osx_var: OSXUnavailable = osx()
   let osx_ios_var: MultiPlatformUnavailable = osx_ios()
   let osx_extension_var: OSXAppExtensionsUnavailable = osx_extension()

test/attr/attr_availability_transitive_osx_appext.swift

@@ -135,25 +135,20 @@ struct AlwaysAvailabileContainer {
 struct NeverAvailableContainer { // expected-note {{'NeverAvailableContainer' has been explicitly marked unavailable here}}
   let never_var: NeverAvailable = never() // expected-error {{'never()' is unavailable}}
   let osx_var: OSXUnavailable = osx() // expected-error {{'osx()' is unavailable}}
-  // expected-error@-1 {{'OSXUnavailable' is unavailable in macOS}}
   let osx_extension_var: OSXAppExtensionsUnavailable = osx_extension() // expected-error {{'osx_extension()' is unavailable in application extensions for macOS}}
-  // expected-error@-1 {{'OSXAppExtensionsUnavailable' is unavailable in application extensions for macOS}}
 }
 
 @available(OSX, unavailable)
 struct OSXUnavailableContainer { // expected-note {{'OSXUnavailableContainer' has been explicitly marked unavailable here}}
   let never_var: NeverAvailable = never() // expected-error {{'never()' is unavailable}}
-  // expected-error@-1 {{'NeverAvailable' is unavailable}}
   let osx_var: OSXUnavailable = osx()
   let osx_extension_var: OSXAppExtensionsUnavailable = osx_extension()
 }
 
 @available(OSXApplicationExtension, unavailable)
 struct OSXAppExtensionsUnavailableContainer { // expected-note {{'OSXAppExtensionsUnavailableContainer' has been explicitly marked unavailable here}}
   let never_var: NeverAvailable = never() // expected-error {{'never()' is unavailable}}
-  // expected-error@-1 {{'NeverAvailable' is unavailable}}
   let osx_var: OSXUnavailable = osx() // expected-error {{'osx()' is unavailable}}
-  // expected-error@-1 {{'OSXUnavailable' is unavailable in macOS}}
   let osx_extension_var: OSXAppExtensionsUnavailable = osx_extension()
 }
 

test/attr/attr_inlinable_available.swift

@@ -1159,7 +1159,7 @@ public struct UnavailablePublicStruct {
              cPublic: AtInliningTarget,
              dPublic: BetweenTargets,
              ePublic: AtDeploymentTarget,
-             fPublic: AfterDeploymentTarget, // expected-error {{'AfterDeploymentTarget' is only available in macOS 11 or newer}}
+             fPublic: AfterDeploymentTarget,
              gPublic: Unavailable
 
   public var aPublicInit: Any = NoAvailable(),
@@ -1175,7 +1175,7 @@ public struct UnavailablePublicStruct {
       cInternal: AtInliningTarget = .init(),
       dInternal: BetweenTargets = .init(),
       eInternal: AtDeploymentTarget = .init(),
-      fInternal: AfterDeploymentTarget = .init(), // expected-error {{'AfterDeploymentTarget' is only available in macOS 11 or newer}}
+      fInternal: AfterDeploymentTarget = .init(),
       gInternal: Unavailable = .init()
 }
 
@@ -1562,8 +1562,7 @@ public protocol UnavailableProtoWithAssoc {
   associatedtype C: AtInliningTargetProto
   associatedtype D: BetweenTargetsProto
   associatedtype E: AtDeploymentTargetProto
-  associatedtype F: AfterDeploymentTargetProto // expected-error {{'AfterDeploymentTargetProto' is only available in}}
-  // expected-note@-1{{add @available attribute to enclosing associated type}}
+  associatedtype F: AfterDeploymentTargetProto
   associatedtype G: UnavailableProto
 }
 
@@ -1596,7 +1595,7 @@ public enum UnavailableEnumWithTypeAliases {
   public typealias C = AtInliningTarget
   public typealias D = BetweenTargets
   public typealias E = AtDeploymentTarget
-  public typealias F = AfterDeploymentTarget // expected-error {{'AfterDeploymentTarget' is only available in macOS 11 or newer}} expected-note {{add @available attribute to enclosing type alias}}
+  public typealias F = AfterDeploymentTarget
   public typealias G = Unavailable
 }
 
@@ -1688,6 +1687,6 @@ public enum UnavailableEnumWithClasses {
   public class InheritsAtInliningTarget: AtInliningTargetClass {}
   public class InheritsBetweenTargets: BetweenTargetsClass {}
   public class InheritsAtDeploymentTarget: AtDeploymentTargetClass {}
-  public class InheritsAfterDeploymentTarget: AfterDeploymentTargetClass {} // expected-error {{'AfterDeploymentTargetClass' is only available in}} expected-note 2 {{add @available attribute to enclosing class}}
+  public class InheritsAfterDeploymentTarget: AfterDeploymentTargetClass {}
   public class InheritsUnavailable: UnavailableClass {}
 }