Skip to content

Commit 94f4b05

Browse files
committed
Sema: Remove unnecessary parameter from getUnsatisfiedAvailabilityConstraint().
The `DeclContext` was unused.
1 parent 669930e commit 94f4b05

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

lib/Sema/DerivedConformanceRawRepresentable.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,12 @@ struct RuntimeVersionCheck {
237237
/// information about the runtime check needed to ensure it is available to
238238
/// \c versionCheck and returns true.
239239
static bool
240-
checkAvailability(const EnumElementDecl *elt, DeclContext *dc,
240+
checkAvailability(const EnumElementDecl *elt,
241241
AvailabilityContext availabilityContext,
242242
std::optional<RuntimeVersionCheck> &versionCheck) {
243-
auto &C = dc->getASTContext();
243+
auto &C = elt->getASTContext();
244244
auto constraint =
245-
getUnsatisfiedAvailabilityConstraint(elt, dc, availabilityContext);
245+
getUnsatisfiedAvailabilityConstraint(elt, availabilityContext);
246246

247247
// Is it always available?
248248
if (!constraint)
@@ -316,7 +316,7 @@ deriveBodyRawRepresentable_init(AbstractFunctionDecl *initDecl, void *) {
316316
// information about that check in versionCheck and keep processing this
317317
// element.
318318
std::optional<RuntimeVersionCheck> versionCheck(std::nullopt);
319-
if (!checkAvailability(elt, parentDC, availabilityContext, versionCheck))
319+
if (!checkAvailability(elt, availabilityContext, versionCheck))
320320
continue;
321321

322322
// litPat = elt.rawValueExpr as a pattern

lib/Sema/TypeCheckAvailability.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3103,9 +3103,8 @@ bool diagnoseExplicitUnavailability(
31033103

31043104
std::optional<AvailabilityConstraint>
31053105
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();
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(

lib/Sema/TypeCheckAvailability.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ void diagnoseOverrideOfUnavailableDecl(ValueDecl *override,
247247
/// Returns `std::nullopt` if the declaration is available.
248248
std::optional<AvailabilityConstraint>
249249
getUnsatisfiedAvailabilityConstraint(const Decl *decl,
250-
const DeclContext *declContext,
251250
AvailabilityContext availabilityContext);
252251

253252
/// Checks whether a declaration should be considered unavailable when referred

0 commit comments

Comments
 (0)