@@ -3103,9 +3103,8 @@ bool diagnoseExplicitUnavailability(
3103
3103
3104
3104
std::optional<AvailabilityConstraint>
3105
3105
swift::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 ();
3109
3108
3110
3109
// Generic parameters are always available.
3111
3110
if (isa<GenericTypeParamDecl>(decl))
@@ -3148,8 +3147,7 @@ swift::getUnsatisfiedAvailabilityConstraint(const Decl *decl,
3148
3147
const DeclContext *referenceDC,
3149
3148
SourceLoc referenceLoc) {
3150
3149
return getUnsatisfiedAvailabilityConstraint (
3151
- decl, referenceDC,
3152
- TypeChecker::availabilityAtLocation (referenceLoc, referenceDC));
3150
+ decl, TypeChecker::availabilityAtLocation (referenceLoc, referenceDC));
3153
3151
}
3154
3152
3155
3153
// / Check if this is a subscript declaration inside String or
@@ -4190,7 +4188,7 @@ bool swift::diagnoseDeclAvailability(const ValueDecl *D, SourceRange R,
4190
4188
auto &ctx = DC->getASTContext ();
4191
4189
4192
4190
auto constraint =
4193
- getUnsatisfiedAvailabilityConstraint (D, DC, Where.getAvailability ());
4191
+ getUnsatisfiedAvailabilityConstraint (D, Where.getAvailability ());
4194
4192
4195
4193
if (constraint && !constraint->isConditionallySatisfiable ()) {
4196
4194
// FIXME: diagnoseExplicitUnavailability should take an unmet requirement
@@ -4699,8 +4697,8 @@ swift::diagnoseConformanceAvailability(SourceLoc loc,
4699
4697
return true ;
4700
4698
}
4701
4699
4702
- auto constraint = getUnsatisfiedAvailabilityConstraint (
4703
- ext, where. getDeclContext () , where.getAvailability ());
4700
+ auto constraint =
4701
+ getUnsatisfiedAvailabilityConstraint (ext , where.getAvailability ());
4704
4702
if (constraint) {
4705
4703
// FIXME: diagnoseExplicitUnavailability() should take unmet requirement
4706
4704
if (diagnoseExplicitUnavailability (
0 commit comments