Skip to content

Commit 5058534

Browse files
committed
AST: Remove AvailableAttr::prettyPlatformString().
1 parent 141a611 commit 5058534

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

include/swift/AST/Attr.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -817,11 +817,6 @@ class AvailableAttr : public DeclAttribute {
817817
/// platform.
818818
bool hasPlatform() const { return getPlatform() != PlatformKind::none; }
819819

820-
/// Returns the human-readable string for the platform of the attribute.
821-
StringRef prettyPlatformString() const {
822-
return swift::prettyPlatformString(getPlatform());
823-
}
824-
825820
/// Create an AvailableAttr that indicates specific availability
826821
/// for all platforms.
827822
static AvailableAttr *

lib/AST/Availability.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ SemanticAvailableAttr::getIntroducedRange(ASTContext &Ctx) const {
832832
assert(domain.isActive(Ctx));
833833

834834
llvm::VersionTuple IntroducedVersion = attr->Introduced.value();
835-
StringRef Platform = attr->prettyPlatformString();
835+
StringRef Platform;
836836
llvm::VersionTuple RemappedIntroducedVersion;
837837
if (AvailabilityInference::updateIntroducedPlatformForFallback(
838838
attr, Ctx, Platform, RemappedIntroducedVersion))

lib/Sema/TypeCheckAttr.cpp

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5018,21 +5018,24 @@ void AttributeChecker::checkBackDeployedAttrs(
50185018
getSemanticAvailableRangeDeclAndAttr(VD)) {
50195019
auto beforePlatformString = prettyPlatformString(Attr->Platform);
50205020
auto beforeVersion = Attr->Version;
5021-
auto availableAttr = availableRangeAttrPair.value().first.getParsedAttr();
5022-
auto introVersion = availableAttr->Introduced.value();
5023-
StringRef introPlatformString = availableAttr->prettyPlatformString();
5021+
auto availableAttr = availableRangeAttrPair.value().first;
5022+
auto introVersion = availableAttr.getIntroduced().value();
5023+
StringRef introPlatformString =
5024+
availableAttr.getDomain().getNameForDiagnostics();
50245025

50255026
AvailabilityInference::updateBeforePlatformForFallback(
50265027
Attr, Ctx, beforePlatformString, beforeVersion);
50275028
AvailabilityInference::updateIntroducedPlatformForFallback(
5028-
availableAttr, Ctx, introPlatformString, introVersion);
5029+
availableAttr.getParsedAttr(), Ctx, introPlatformString,
5030+
introVersion);
50295031

50305032
if (Attr->Version <= introVersion) {
50315033
diagnose(AtLoc, diag::attr_has_no_effect_decl_not_available_before,
50325034
Attr, VD, beforePlatformString, beforeVersion);
5033-
diagnose(availableAttr->AtLoc, diag::availability_introduced_in_version,
5034-
VD, introPlatformString, introVersion)
5035-
.highlight(availableAttr->getRange());
5035+
diagnose(availableAttr.getParsedAttr()->AtLoc,
5036+
diag::availability_introduced_in_version, VD,
5037+
introPlatformString, introVersion)
5038+
.highlight(availableAttr.getParsedAttr()->getRange());
50365039
continue;
50375040
}
50385041
}

0 commit comments

Comments
 (0)