s/isUnavailableInCurrentSwift/isUnavailableInSwiftVersion/, pass version.

Author: graydon

include/swift/AST/Attr.h

@@ -21,6 +21,7 @@
 #include "swift/Basic/UUID.h"
 #include "swift/Basic/STLExtras.h"
 #include "swift/Basic/Range.h"
+#include "swift/Basic/Version.h"
 #include "swift/AST/Identifier.h"
 #include "swift/AST/AttrKind.h"
 #include "swift/AST/ConcreteDeclRef.h"
@@ -1081,9 +1082,11 @@ class DeclAttributes {
     return getUnavailable(ctx) != nullptr;
   }
 
-  /// Determine whether there is an "unavailable in current Swift"
-  /// attribute.
-  bool isUnavailableInCurrentSwift() const;
+  /// Determine whether there is a swiftVersionSpecific attribute that's
+  /// unavailable relative to the provided language version (defaulting to
+  /// current language version).
+  bool isUnavailableInSwiftVersion(const version::Version &effectiveVersion =
+           version::Version::getCurrentLanguageVersion()) const;
 
   /// Returns the first @available attribute that indicates
   /// a declaration is unavailable, or null otherwise.

lib/AST/ASTPrinter.cpp

@@ -1449,7 +1449,7 @@ bool swift::shouldPrint(const Decl *D, PrintOptions &Options) {
     return false;
 
   // Skip stub declarations used for prior or later variants of Swift.
-  if (D->getAttrs().isUnavailableInCurrentSwift())
+  if (D->getAttrs().isUnavailableInSwiftVersion())
     return false;
 
   if (Options.ExplodeEnumCaseDecls) {

lib/AST/Attr.cpp

@@ -85,15 +85,24 @@ bool DeclAttribute::canAttributeAppearOnDeclKind(DeclAttrKind DAK, DeclKind DK)
   llvm_unreachable("bad DeclKind");
 }
 
-bool DeclAttributes::isUnavailableInCurrentSwift() const {
+bool
+DeclAttributes::isUnavailableInSwiftVersion(
+  const version::Version &effectiveVersion) const {
+  clang::VersionTuple vers = effectiveVersion;
   for (auto attr : *this) {
     if (auto available = dyn_cast<AvailableAttr>(attr)) {
       if (available->isInvalid())
         continue;
 
       if (available->getPlatformAgnosticAvailability() ==
-            PlatformAgnosticAvailabilityKind::SwiftVersionSpecific)
-        return true;
+          PlatformAgnosticAvailabilityKind::SwiftVersionSpecific) {
+        if (available->Introduced.hasValue() &&
+            available->Introduced.getValue() > vers)
+          return true;
+        if (available->Obsoleted.hasValue() &&
+            available->Obsoleted.getValue() <= vers)
+          return true;
+      }
     }
   }
 

lib/AST/NameLookup.cpp

@@ -648,7 +648,7 @@ UnqualifiedLookup::UnqualifiedLookup(DeclName Name, DeclContext *DC,
           auto unavailableLookupResult =
             [&](const UnqualifiedLookupResult &result) {
             return result.getValueDecl()->getAttrs()
-                     .isUnavailableInCurrentSwift();
+                     .isUnavailableInSwiftVersion();
           };
 
           // If all of the results we found are unavailable, keep looking.
@@ -849,7 +849,7 @@ UnqualifiedLookup::UnqualifiedLookup(DeclName Name, DeclContext *DC,
             auto unavailableLookupResult =
               [&](const UnqualifiedLookupResult &result) {
               return result.getValueDecl()->getAttrs()
-                       .isUnavailableInCurrentSwift();
+                       .isUnavailableInSwiftVersion();
             };
 
             // If all of the results we found are unavailable, keep looking.

lib/ClangImporter/ImportDecl.cpp

@@ -3595,7 +3595,7 @@ namespace {
             typeResolver->resolveDeclSignature(singleResult);
 
           // Skip Swift 2 variants.
-          if (singleResult->getAttrs().isUnavailableInCurrentSwift())
+          if (singleResult->getAttrs().isUnavailableInSwiftVersion())
             continue;
 
           if (found)
@@ -6000,7 +6000,7 @@ void SwiftDeclConverter::importMirroredProtocolMembers(
 
     for (auto member : proto->getMembers()) {
       // Skip Swift 2 stubs; there's no reason to mirror them.
-      if (member->getAttrs().isUnavailableInCurrentSwift())
+      if (member->getAttrs().isUnavailableInSwiftVersion())
         continue;
 
       if (auto prop = dyn_cast<VarDecl>(member)) {
@@ -6097,7 +6097,7 @@ void SwiftDeclConverter::importInheritedConstructors(
         continue;
 
       // Don't inherit Swift 2 stubs.
-      if (ctor->getAttrs().isUnavailableInCurrentSwift())
+      if (ctor->getAttrs().isUnavailableInSwiftVersion())
         continue;
 
       // Don't inherit (non-convenience) factory initializers.