AST: Simplify AvailabilityRange construction.

Introduce a constructor that takes an `llvm::VersionTuple` directly, instead of
needing to spell out `VersionRange::allGTE(<tuple>)` which is unnecessarily
verbose.

Author: tshortli

include/swift/AST/AvailabilityRange.h

@@ -208,6 +208,8 @@ class AvailabilityRange {
   VersionRange Range;
 
 public:
+  explicit AvailabilityRange(llvm::VersionTuple LowerEndpoint)
+      : Range(VersionRange::allGTE(LowerEndpoint)) {}
   explicit AvailabilityRange(VersionRange Range) : Range(Range) {}
 
   /// Creates a context that imposes the constraints of the ASTContext's

lib/AST/Availability.cpp

@@ -58,17 +58,15 @@ void VersionRange::Profile(llvm::FoldingSetNodeID &id) const {
 
 AvailabilityRange
 AvailabilityRange::forDeploymentTarget(const ASTContext &Ctx) {
-  return AvailabilityRange(
-      VersionRange::allGTE(Ctx.LangOpts.getMinPlatformVersion()));
+  return AvailabilityRange(Ctx.LangOpts.getMinPlatformVersion());
 }
 
 AvailabilityRange AvailabilityRange::forInliningTarget(const ASTContext &Ctx) {
-  return AvailabilityRange(
-      VersionRange::allGTE(Ctx.LangOpts.MinimumInliningTargetVersion));
+  return AvailabilityRange(Ctx.LangOpts.MinimumInliningTargetVersion);
 }
 
 AvailabilityRange AvailabilityRange::forRuntimeTarget(const ASTContext &Ctx) {
-  return AvailabilityRange(VersionRange::allGTE(Ctx.LangOpts.RuntimeVersion));
+  return AvailabilityRange(Ctx.LangOpts.RuntimeVersion);
 }
 
 namespace {
@@ -853,7 +851,7 @@ SemanticAvailableAttr::getIntroducedRange(const ASTContext &Ctx) const {
           *this, Ctx, unusedDomain, remappedVersion))
     introducedVersion = remappedVersion;
 
-  return AvailabilityRange{VersionRange::allGTE(introducedVersion)};
+  return AvailabilityRange{introducedVersion};
 }
 
 std::optional<llvm::VersionTuple> SemanticAvailableAttr::getDeprecated() const {
@@ -877,7 +875,7 @@ SemanticAvailableAttr::getDeprecatedRange(const ASTContext &Ctx) const {
           *this, Ctx, unusedDomain, remappedVersion))
     deprecatedVersion = remappedVersion;
 
-  return AvailabilityRange{VersionRange::allGTE(deprecatedVersion)};
+  return AvailabilityRange{deprecatedVersion};
 }
 
 std::optional<llvm::VersionTuple> SemanticAvailableAttr::getObsoleted() const {
@@ -901,7 +899,7 @@ SemanticAvailableAttr::getObsoletedRange(const ASTContext &Ctx) const {
           *this, Ctx, unusedDomain, remappedVersion))
     obsoletedVersion = remappedVersion;
 
-  return AvailabilityRange{VersionRange::allGTE(obsoletedVersion)};
+  return AvailabilityRange{obsoletedVersion};
 }
 
 namespace {
@@ -931,8 +929,7 @@ AvailabilityRange ASTContext::getSwiftFutureAvailability() const {
   auto target = LangOpts.Target;
 
   auto getFutureAvailabilityRange = []() -> AvailabilityRange {
-    return AvailabilityRange(
-        VersionRange::allGTE(llvm::VersionTuple(99, 99, 0)));
+    return AvailabilityRange(llvm::VersionTuple(99, 99, 0));
   };
 
   if (target.isMacOSX()) {

lib/AST/AvailabilityDomain.cpp

@@ -126,7 +126,7 @@ getDeploymentVersion(const AvailabilityDomain &domain, const ASTContext &ctx) {
 std::optional<AvailabilityRange>
 AvailabilityDomain::getDeploymentRange(const ASTContext &ctx) const {
   if (auto version = getDeploymentVersion(*this, ctx))
-    return AvailabilityRange{VersionRange::allGTE(*version)};
+    return AvailabilityRange{*version};
   return std::nullopt;
 }
 

lib/AST/Decl.cpp

@@ -1370,7 +1370,7 @@ AvailabilityRange Decl::getAvailabilityForLinkage() const {
   // When computing availability for linkage, use the "before" version from
   // the @backDeployed attribute, if present.
   if (auto backDeployVersion = getBackDeployedBeforeOSVersion(ctx))
-    return AvailabilityRange{VersionRange::allGTE(*backDeployVersion)};
+    return AvailabilityRange{*backDeployVersion};
 
   auto containingContext = AvailabilityInference::annotatedAvailableRange(this);
   if (containingContext.has_value()) {

lib/Parse/ParseDecl.cpp

@@ -609,7 +609,7 @@ bool Parser::parseSpecializeAttributeArguments(
                                  diag::sil_availability_expected_version))
           return false;
 
-        *SILAvailability = AvailabilityRange(VersionRange::allGTE(version));
+        *SILAvailability = AvailabilityRange(version);
       }
       if (ParamLabel == "availability") {
         SourceRange attrRange;

lib/SIL/Parser/ParseSIL.cpp

@@ -758,7 +758,7 @@ static bool parseDeclSILOptional(
                                  diag::sil_availability_expected_version))
         return true;
 
-      *availability = AvailabilityRange(VersionRange::allGTE(version));
+      *availability = AvailabilityRange(version);
 
       SP.P.parseToken(tok::r_square, diag::expected_in_attribute_list);
       continue;

lib/SILGen/SILGenBackDeploy.cpp

@@ -225,8 +225,7 @@ bool SILGenModule::requiresBackDeploymentThunk(ValueDecl *decl,
   // high enough that the ABI implementation of the back deployed declaration is
   // guaranteed to be available.
   auto deploymentAvailability = AvailabilityRange::forDeploymentTarget(ctx);
-  auto declAvailability =
-      AvailabilityRange(VersionRange::allGTE(*backDeployBeforeVersion));
+  auto declAvailability = AvailabilityRange(*backDeployBeforeVersion);
   if (deploymentAvailability.isContainedIn(declAvailability))
     return false;
 

lib/Sema/TypeCheckAvailability.cpp

@@ -1425,7 +1425,7 @@ class AvailabilityScopeBuilder : private ASTWalker {
     llvm::VersionTuple Version =
         (GetRuntimeContext ? Spec.getRuntimeVersion() : Spec.getVersion());
 
-    return AvailabilityRange(VersionRange::allGTE(Version));
+    return AvailabilityRange(Version);
   }
 
   PreWalkResult<Expr *> walkToExprPre(Expr *E) override {

lib/Serialization/DeserializeSIL.cpp

@@ -912,9 +912,9 @@ llvm::Expected<SILFunction *> SILDeserializer::readSILFunctionChecked(
 
     llvm::VersionTuple available;
     DECODE_VER_TUPLE(available);
-    fn->setAvailabilityForLinkage(
-        available.empty() ? AvailabilityRange::alwaysAvailable()
-                          : AvailabilityRange(VersionRange::allGTE(available)));
+    fn->setAvailabilityForLinkage(available.empty()
+                                      ? AvailabilityRange::alwaysAvailable()
+                                      : AvailabilityRange(available));
 
     fn->setIsDynamic(IsDynamicallyReplaceable_t(isDynamic));
     fn->setIsExactSelfClass(IsExactSelfClass_t(isExactSelfClass));
@@ -1034,9 +1034,8 @@ llvm::Expected<SILFunction *> SILDeserializer::readSILFunctionChecked(
 
     llvm::VersionTuple available;
     DECODE_VER_TUPLE(available);
-    auto availability =
-        available.empty() ? AvailabilityRange::alwaysAvailable()
-                          : AvailabilityRange(VersionRange::allGTE(available));
+    auto availability = available.empty() ? AvailabilityRange::alwaysAvailable()
+                                          : AvailabilityRange(available);
 
     llvm::SmallVector<Type, 4> typeErasedParams;
     for (auto id : typeErasedParamsIDs) {

unittests/AST/AvailabilityContextTests.cpp

@@ -23,8 +23,7 @@ static llvm::VersionTuple getPlatformIntro(const AvailabilityContext &context) {
 }
 
 static AvailabilityRange getAvailabilityRange(unsigned major, unsigned minor) {
-  return AvailabilityRange(
-      VersionRange::allGTE(llvm::VersionTuple(major, minor)));
+  return AvailabilityRange(llvm::VersionTuple(major, minor));
 }
 
 class AvailabilityContextTest : public ::testing::Test {