Skip to content

Commit 32f8153

Browse files
committed
[Sema] Check for any unavailability with rename when suggesting rename
of enum cases, not just ones that aren't available in the current version of Swift. https://bugs.swift.org/browse/SR-1496 rdar://problem/26245512
1 parent 2daa140 commit 32f8153

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lib/Sema/TypeCheckPattern.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ using namespace swift;
3333
static EnumElementDecl *
3434
extractEnumElement(TypeChecker &TC, SourceLoc UseLoc, const VarDecl *constant) {
3535
if (auto Attr = AvailableAttr::isUnavailable(constant)) {
36-
auto Kind = Attr->getUnconditionalAvailability();
37-
if (Kind == UnconditionalAvailabilityKind::UnavailableInCurrentSwift) {
38-
auto diag = TC.diagnose(UseLoc, diag::availability_decl_unavailable_rename,
39-
constant->getName(), /*"replaced"*/false,
40-
/*special kind*/0, Attr->Rename);
41-
diag.fixItReplace(UseLoc, Attr->Rename);
36+
auto Rename = Attr->Rename;
37+
if (!Rename.empty()) {
38+
TC.diagnose(UseLoc, diag::availability_decl_unavailable_rename,
39+
constant->getName(), /*replaced*/false,
40+
/*special kind*/0, Attr->Rename)
41+
.fixItReplace(UseLoc, Rename);
4242
}
4343
}
4444

0 commit comments

Comments
 (0)