Merge pull request #24997 from xymus/extension-availability

Support unavailable and obsoleted attributes on extensions

Author: xymus

lib/AST/Attr.cpp

@@ -1048,7 +1048,14 @@ AvailableVersionComparison AvailableAttr::getVersionAvailability(
 
 const AvailableAttr *AvailableAttr::isUnavailable(const Decl *D) {
   ASTContext &ctx = D->getASTContext();
-  return D->getAttrs().getUnavailable(ctx);
+  if (auto attr = D->getAttrs().getUnavailable(ctx))
+    return attr;
+
+  // If D is an extension member, check if the extension is unavailable.
+  if (auto ext = dyn_cast<ExtensionDecl>(D->getDeclContext()))
+    return AvailableAttr::isUnavailable(ext);
+
+  return nullptr;
 }
 
 SpecializeAttr::SpecializeAttr(SourceLoc atLoc, SourceRange range,

lib/Sema/TypeCheckAvailability.cpp

@@ -1503,13 +1503,17 @@ static bool isInsideUnavailableDeclaration(SourceRange ReferenceRange,
 /// Returns true if the reference or any of its parents is an
 /// unconditional unavailable declaration for the same platform.
 static bool isInsideCompatibleUnavailableDeclaration(
-    SourceRange ReferenceRange, const DeclContext *ReferenceDC,
-    const AvailableAttr *attr) {
+    const ValueDecl *referencedD, SourceRange ReferenceRange,
+    const DeclContext *ReferenceDC, const AvailableAttr *attr) {
   if (!attr->isUnconditionallyUnavailable()) {
     return false;
   }
+
+  // Refuse calling unavailable functions from unavailable code,
+  // but allow the use of types.
   PlatformKind platform = attr->Platform;
-  if (platform == PlatformKind::none) {
+  if (platform == PlatformKind::none &&
+      !isa<TypeDecl>(referencedD)) {
     return false;
   }
 
@@ -2129,7 +2133,7 @@ bool swift::diagnoseExplicitUnavailability(
   // unavailability is OK -- the eventual caller can't call the
   // enclosing code in the same situations it wouldn't be able to
   // call this code.
-  if (isInsideCompatibleUnavailableDeclaration(R, DC, Attr)) {
+  if (isInsideCompatibleUnavailableDeclaration(D, R, DC, Attr)) {
     return false;
   }
 

test/attr/attr_availability.swift

@@ -1069,3 +1069,16 @@ func rdar46348825_deprecated() {}
 @available(swift, obsoleted: 4.0, obsoleted: 4.0)
 // expected-warning@-1 {{'obsoleted' argument has already been specified}}
 func rdar46348825_obsoleted() {}
+
+// Referencing unavailable types in signatures of unavailable functions should be accepted
+@available(*, unavailable)
+protocol UnavailableProto {
+}
+
+@available(*, unavailable)
+func unavailableFunc(_ arg: UnavailableProto) -> UnavailableProto {}
+
+@available(*, unavailable)
+struct S {
+  var a: UnavailableProto
+}

test/attr/attr_availability_osx.swift

@@ -141,3 +141,60 @@ func testAccessors() {
   t.unavailableSetter = .init() // expected-error {{setter for 'unavailableSetter' is unavailable in macOS: bad setter}}
   t.unavailableSetter.mutate() // expected-error {{setter for 'unavailableSetter' is unavailable in macOS: bad setter}}
 }
+
+// Check available on extensions
+
+@available(macOS, unavailable)
+extension TestStruct {
+  func unavailInExtension() {} // expected-note 2 {{'unavailInExtension()' has been explicitly marked unavailable here}}
+}
+
+@available(macOS, obsoleted: 10.0)
+extension TestStruct {
+  func obsoletedInExtension() {} // expected-note 2 {{'obsoletedInExtension()' was obsoleted in macOS 10.0}}
+}
+
+@available(macOS, deprecated: 10.0)
+extension TestStruct {
+  func deprecatedInExtension() {}
+}
+
+@available(swift, introduced: 50.0)
+extension TestStruct {
+  func introducedInExtensionSwift() {} // expected-note 2 {{'introducedInExtensionSwift()' was introduced in Swift 50.0}}
+}
+
+@available(macOS, introduced: 10.50)
+extension TestStruct {
+  func introducedInExtensionMacOS() {}
+}
+
+TestStruct().unavailInExtension() // expected-error {{'unavailInExtension()' is unavailable in macOS}}
+TestStruct().obsoletedInExtension() // expected-error {{'obsoletedInExtension()' is unavailable}}
+TestStruct().deprecatedInExtension() // expected-warning {{'deprecatedInExtension()' was deprecated in macOS 10.0}}
+TestStruct().introducedInExtensionSwift() // expected-error {{'introducedInExtensionSwift()' is unavailable}}
+TestStruct().introducedInExtensionMacOS() // expected-error {{'introducedInExtensionMacOS()' is only available in macOS 10.50 or newer}}
+// expected-note@-1{{add 'if #available' version check}}
+
+extension TestStruct {
+  func availableFunc() {
+    unavailInExtension() // expected-error {{'unavailInExtension()' is unavailable in macOS}}
+    obsoletedInExtension() // expected-error {{'obsoletedInExtension()' is unavailable}}
+    deprecatedInExtension() // expected-warning {{'deprecatedInExtension()' was deprecated in macOS 10.0}}
+    introducedInExtensionSwift() // expected-error {{'introducedInExtensionSwift()' is unavailable}}
+  }
+}
+
+extension TestStruct { // expected-note{{add @available attribute to enclosing extension}}
+  func availableFuncMacOS() { // expected-note{{add @available attribute to enclosing instance method}}
+    introducedInExtensionMacOS() // expected-error {{'introducedInExtensionMacOS()' is only available in macOS 10.50 or newer}}
+    // expected-note@-1{{add 'if #available' version check}}
+  }
+}
+
+@available(macOS, introduced: 10.50)
+extension TestStruct {
+  func futureFuncMacOS() {
+    introducedInExtensionMacOS()
+  }
+}

test/attr/attr_availability_swift.swift

@@ -29,15 +29,15 @@ extension TestStruct {
   func doTheThing() {} // expected-note {{'doTheThing()' was introduced in Swift 400}}
 }
 
-@available(swift 400) // FIXME: This has no effect and should be complained about.
+@available(swift 400)
 extension TestStruct {
-  func doAnotherThing() {}
+  func doAnotherThing() {} // expected-note {{'doAnotherThing()' was introduced in Swift 400}}
 }
 
 @available(macOS 10.11, *)
 func testMemberAvailability() {
   TestStruct().doTheThing() // expected-error {{'doTheThing()' is unavailable}}
-  TestStruct().doAnotherThing() // okay (for now)
+  TestStruct().doAnotherThing() // expected-error {{'doAnotherThing()' is unavailable}}
 }
 
 @available(swift 400) // FIXME: This has no effect and should be complained about.