@@ -3103,9 +3103,8 @@ bool diagnoseExplicitUnavailability(
31033103
31043104std::optional<AvailabilityConstraint>
31053105swift::getUnsatisfiedAvailabilityConstraint (
3106- const Decl *decl, const DeclContext *declContext,
3107- AvailabilityContext availabilityContext) {
3108- auto &ctx = declContext->getASTContext ();
3106+ const Decl *decl, AvailabilityContext availabilityContext) {
3107+ auto &ctx = decl->getASTContext ();
31093108
31103109 // Generic parameters are always available.
31113110 if (isa<GenericTypeParamDecl>(decl))
@@ -3148,8 +3147,7 @@ swift::getUnsatisfiedAvailabilityConstraint(const Decl *decl,
31483147 const DeclContext *referenceDC,
31493148 SourceLoc referenceLoc) {
31503149 return getUnsatisfiedAvailabilityConstraint (
3151- decl, referenceDC,
3152- TypeChecker::availabilityAtLocation (referenceLoc, referenceDC));
3150+ decl, TypeChecker::availabilityAtLocation (referenceLoc, referenceDC));
31533151}
31543152
31553153// / Check if this is a subscript declaration inside String or
@@ -4190,7 +4188,7 @@ bool swift::diagnoseDeclAvailability(const ValueDecl *D, SourceRange R,
41904188 auto &ctx = DC->getASTContext ();
41914189
41924190 auto constraint =
4193- getUnsatisfiedAvailabilityConstraint (D, DC, Where.getAvailability ());
4191+ getUnsatisfiedAvailabilityConstraint (D, Where.getAvailability ());
41944192
41954193 if (constraint && !constraint->isConditionallySatisfiable ()) {
41964194 // FIXME: diagnoseExplicitUnavailability should take an unmet requirement
@@ -4699,8 +4697,8 @@ swift::diagnoseConformanceAvailability(SourceLoc loc,
46994697 return true ;
47004698 }
47014699
4702- auto constraint = getUnsatisfiedAvailabilityConstraint (
4703- ext, where. getDeclContext () , where.getAvailability ());
4700+ auto constraint =
4701+ getUnsatisfiedAvailabilityConstraint (ext , where.getAvailability ());
47044702 if (constraint) {
47054703 // FIXME: diagnoseExplicitUnavailability() should take unmet requirement
47064704 if (diagnoseExplicitUnavailability (
0 commit comments