---

yaml
---
r: 349488
b: refs/heads/master-next
c: a823104
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 39821adf5af9b3d8d8806e520cefb6bf9dfd4e1d
+refs/heads/master-next: a8231043f401c005c7ae877a43fd25a36b55c306
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/Sema/TypeCheckAvailability.cpp

@@ -2838,7 +2838,9 @@ void swift::checkExplicitAvailability(Decl *decl) {
   // Warn on decls without an introduction version.
   auto &ctx = decl->getASTContext();
   auto safeRangeUnderApprox = AvailabilityInference::availableRange(decl, ctx);
-  if (!safeRangeUnderApprox.getOSVersion().hasLowerEndpoint()) {
+  if (!safeRangeUnderApprox.getOSVersion().hasLowerEndpoint() &&
+      !decl->getAttrs().isUnavailable(ctx)) {
+
     auto diag = decl->diagnose(diag::public_decl_needs_availability);
 
     auto suggestPlatform = decl->getASTContext().LangOpts.RequireExplicitAvailabilityTarget;

branches/master-next/test/attr/require_explicit_availability.swift

@@ -13,9 +13,15 @@ func bar() { } // expected-warning {{public declarations should have an availabi
 @available(macOS 10.1, *)
 public func ok() { }
 
+@available(macOS, unavailable)
+public func unavailableOk() { }
+
 @available(macOS, deprecated: 10.10)
 public func missingIntro() { } // expected-warning {{public declarations should have an availability attribute with -require-explicit-availability}} {{1-1=@available(macOS 10.10, *)\n}}
 
+@available(iOS 9.0, *)
+public func missingTargetPlatform() { } // expected-warning {{public declarations should have an availability attribute with -require-explicit-availability}} {{1-1=@available(macOS 10.10, *)\n}}
+
 func privateFunc() { }
 
 @_alwaysEmitIntoClient