Sema: Adopt getAvailabilityConstraintsForDecl().

Replaces `getUnsatisfiedAvailabilityConstraint()`.

NFC.

Author: tshortli

lib/Sema/DerivedConformanceRawRepresentable.cpp

@@ -20,6 +20,7 @@
 #include "TypeCheckAvailability.h"
 #include "TypeCheckDecl.h"
 #include "TypeChecker.h"
+#include "swift/AST/AvailabilityConstraint.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/Expr.h"
 #include "swift/AST/ParameterList.h"
@@ -241,8 +242,8 @@ checkAvailability(const EnumElementDecl *elt,
                   AvailabilityContext availabilityContext,
                   std::optional<RuntimeVersionCheck> &versionCheck) {
   auto &C = elt->getASTContext();
-  auto constraint =
-      getUnsatisfiedAvailabilityConstraint(elt, availabilityContext);
+  auto constraint = getAvailabilityConstraintsForDecl(elt, availabilityContext)
+                        .getPrimaryConstraint();
 
   // Is it always available?
   if (!constraint)

lib/Sema/TypeCheckAvailability.cpp

@@ -22,6 +22,7 @@
 #include "TypeCheckUnsafe.h"
 #include "TypeChecker.h"
 #include "swift/AST/ASTWalker.h"
+#include "swift/AST/AvailabilityConstraint.h"
 #include "swift/AST/AvailabilityDomain.h"
 #include "swift/AST/AvailabilityInference.h"
 #include "swift/AST/AvailabilityScope.h"
@@ -2955,7 +2956,8 @@ void swift::diagnoseOverrideOfUnavailableDecl(ValueDecl *override,
   // recomputing it.
   ExportContext where = ExportContext::forDeclSignature(override, nullptr);
   auto constraint =
-      getUnsatisfiedAvailabilityConstraint(base, where.getAvailability());
+      getAvailabilityConstraintsForDecl(base, where.getAvailability())
+          .getPrimaryConstraint();
   if (!constraint)
     return;
 
@@ -3084,20 +3086,14 @@ bool diagnoseExplicitUnavailability(SourceLoc loc,
   return true;
 }
 
-std::optional<AvailabilityConstraint>
-swift::getUnsatisfiedAvailabilityConstraint(
-    const Decl *decl, AvailabilityContext availabilityContext) {
-  auto constraints =
-      swift::getAvailabilityConstraintsForDecl(decl, availabilityContext);
-  return constraints.getPrimaryConstraint();
-}
-
 std::optional<AvailabilityConstraint>
 swift::getUnsatisfiedAvailabilityConstraint(const Decl *decl,
                                             const DeclContext *referenceDC,
                                             SourceLoc referenceLoc) {
-  return getUnsatisfiedAvailabilityConstraint(
-      decl, TypeChecker::availabilityAtLocation(referenceLoc, referenceDC));
+  return getAvailabilityConstraintsForDecl(
+             decl,
+             TypeChecker::availabilityAtLocation(referenceLoc, referenceDC))
+      .getPrimaryConstraint();
 }
 
 /// Check if this is a subscript declaration inside String or
@@ -4131,7 +4127,8 @@ bool swift::diagnoseDeclAvailability(const ValueDecl *D, SourceRange R,
   auto &ctx = DC->getASTContext();
 
   auto constraint =
-      getUnsatisfiedAvailabilityConstraint(D, Where.getAvailability());
+      getAvailabilityConstraintsForDecl(D, Where.getAvailability())
+          .getPrimaryConstraint();
 
   if (constraint) {
     if (diagnoseExplicitUnavailability(D, R, *constraint, Where, call, Flags))
@@ -4652,7 +4649,8 @@ swift::diagnoseConformanceAvailability(SourceLoc loc,
     }
 
     auto constraint =
-        getUnsatisfiedAvailabilityConstraint(ext, where.getAvailability());
+        getAvailabilityConstraintsForDecl(ext, where.getAvailability())
+            .getPrimaryConstraint();
     if (constraint) {
       if (diagnoseExplicitUnavailability(loc, *constraint, rootConf, ext, where,
                                          warnIfConformanceUnavailablePreSwift6,

lib/Sema/TypeCheckAvailability.h

@@ -250,14 +250,6 @@ void diagnoseOverrideOfUnavailableDecl(ValueDecl *override,
                                        const ValueDecl *base,
                                        SemanticAvailableAttr attr);
 
-/// Checks whether a declaration should be considered unavailable when referred
-/// to in the given declaration context and availability context and, if so,
-/// returns a result that describes the unsatisfied constraint.
-/// Returns `std::nullopt` if the declaration is available.
-std::optional<AvailabilityConstraint>
-getUnsatisfiedAvailabilityConstraint(const Decl *decl,
-                                     AvailabilityContext availabilityContext);
-
 /// Checks whether a declaration should be considered unavailable when referred
 /// to at the given source location in the given decl context and, if so,
 /// returns a result that describes the unsatisfied constraint.