Skip to content

Commit 4e9a883

Browse files
tshortlitshortli
committed
AST: Rename SwiftLanguage availability domain kind to SwiftLanguageMode.
1 parent 1fd5455 commit 4e9a883

16 files changed

+47
-44
lines changed

‎include/swift/AST/Attr.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3972,7 +3972,7 @@ class SemanticAvailableAttr final {
39723972

39733973
/// Whether this is a language mode specific attribute.
39743974
bool isSwiftLanguageModeSpecific() const {
3975-
return getDomain().isSwiftLanguage() && isVersionSpecific();
3975+
return getDomain().isSwiftLanguageMode() && isVersionSpecific();
39763976
}
39773977

39783978
/// Whether this is a PackageDescription version specific attribute.

‎include/swift/AST/AvailabilityDomain.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class AvailabilityDomain final {
4949
Universal,
5050

5151
/// Represents availability with respect to Swift language mode.
52-
SwiftLanguage,
52+
SwiftLanguageMode,
5353

5454
/// Represents PackageDescription availability.
5555
PackageDescription,
@@ -140,8 +140,8 @@ class AvailabilityDomain final {
140140
return AvailabilityDomain(platformKind);
141141
}
142142

143-
static AvailabilityDomain forSwiftLanguage() {
144-
return AvailabilityDomain(Kind::SwiftLanguage);
143+
static AvailabilityDomain forSwiftLanguageMode() {
144+
return AvailabilityDomain(Kind::SwiftLanguageMode);
145145
}
146146

147147
static AvailabilityDomain forPackageDescription() {
@@ -181,7 +181,9 @@ class AvailabilityDomain final {
181181

182182
bool isPlatform() const { return getKind() == Kind::Platform; }
183183

184-
bool isSwiftLanguage() const { return getKind() == Kind::SwiftLanguage; }
184+
bool isSwiftLanguageMode() const {
185+
return getKind() == Kind::SwiftLanguageMode;
186+
}
185187

186188
bool isPackageDescription() const {
187189
return getKind() == Kind::PackageDescription;

‎lib/APIDigester/ModuleAnalyzerNodes.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1380,7 +1380,7 @@ StringRef SDKContext::getLanguageIntroVersion(Decl *D) {
13801380
for (auto attr : D->getSemanticAvailableAttrs()) {
13811381
auto domain = attr.getDomain();
13821382

1383-
if (domain.isSwiftLanguage() && attr.getIntroduced()) {
1383+
if (domain.isSwiftLanguageMode() && attr.getIntroduced()) {
13841384
return buffer(attr.getIntroduced()->getAsString());
13851385
}
13861386
}

‎lib/AST/Attr.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ static void printAvailableAttr(const Decl *D, const SemanticAvailableAttr &Attr,
978978
// attributes that are universally unavailable in Swift, we must print them
979979
// as universally unavailable instead.
980980
// FIXME: Reconsider this, it's a weird special case.
981-
if (Domain.isSwiftLanguage() && Attr.isUnconditionallyUnavailable())
981+
if (Domain.isSwiftLanguageMode() && Attr.isUnconditionallyUnavailable())
982982
Printer << "*";
983983
else
984984
Printer << Domain.getNameForAttributePrinting();
@@ -1020,7 +1020,8 @@ static void printAvailableAttr(const Decl *D, const SemanticAvailableAttr &Attr,
10201020
if (!Attr.getMessage().empty()) {
10211021
Printer << ", message: ";
10221022
Printer.printEscapedStringLiteral(Attr.getMessage());
1023-
} else if (Domain.isSwiftLanguage() && Attr.isUnconditionallyUnavailable())
1023+
} else if (Domain.isSwiftLanguageMode() &&
1024+
Attr.isUnconditionallyUnavailable())
10241025
Printer << ", message: \"Not available in Swift\"";
10251026
}
10261027

@@ -2329,7 +2330,7 @@ AvailableAttr *AvailableAttr::createUnavailableInSwift(ASTContext &C,
23292330
StringRef Message,
23302331
StringRef Rename) {
23312332
return new (C) AvailableAttr(
2332-
SourceLoc(), SourceRange(), AvailabilityDomain::forSwiftLanguage(),
2333+
SourceLoc(), SourceRange(), AvailabilityDomain::forSwiftLanguageMode(),
23332334
SourceLoc(), Kind::Unavailable, Message, Rename,
23342335
/*Introduced=*/{}, SourceRange(), /*Deprecated=*/{}, SourceRange(),
23352336
/*Obsoleted=*/{}, SourceRange(),
@@ -2341,7 +2342,7 @@ AvailableAttr *AvailableAttr::createSwiftLanguageModeVersioned(
23412342
ASTContext &C, StringRef Message, StringRef Rename,
23422343
llvm::VersionTuple Introduced, llvm::VersionTuple Obsoleted) {
23432344
return new (C) AvailableAttr(
2344-
SourceLoc(), SourceRange(), AvailabilityDomain::forSwiftLanguage(),
2345+
SourceLoc(), SourceRange(), AvailabilityDomain::forSwiftLanguageMode(),
23452346
SourceLoc(), Kind::Default, Message, Rename, Introduced, SourceRange(),
23462347
/*Deprecated=*/{}, SourceRange(), Obsoleted, SourceRange(),
23472348
/*Implicit=*/false,

‎lib/AST/Availability.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ SemanticAvailableAttrRequest::evaluate(swift::Evaluator &evaluator,
855855
return std::nullopt;
856856
}
857857

858-
if (domain->isSwiftLanguage() || domain->isPackageDescription()) {
858+
if (domain->isSwiftLanguageMode() || domain->isPackageDescription()) {
859859
switch (attr->getKind()) {
860860
case AvailableAttr::Kind::Deprecated:
861861
diags.diagnose(attrLoc,

‎lib/AST/AvailabilityConstraint.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ static bool canIgnoreConstraintInUnavailableContexts(
162162
if (!flags.contains(AvailabilityConstraintFlag::
163163
AllowUniversallyUnavailableInCompatibleContexts)) {
164164
if (!isa<TypeDecl>(decl) && !isa<ExtensionDecl>(decl)) {
165-
if (domain.isUniversal() || domain.isSwiftLanguage())
165+
if (domain.isUniversal() || domain.isSwiftLanguageMode())
166166
return false;
167167
}
168168
}
@@ -342,7 +342,7 @@ domainCanBeUnconditionallyUnavailableAtRuntime(AvailabilityDomain domain,
342342
return true;
343343
return domain.isActive(ctx);
344344

345-
case AvailabilityDomain::Kind::SwiftLanguage:
345+
case AvailabilityDomain::Kind::SwiftLanguageMode:
346346
case AvailabilityDomain::Kind::PackageDescription:
347347
return false;
348348

@@ -369,7 +369,7 @@ domainIsUnavailableAtRuntimeIfUnintroduced(AvailabilityDomain domain,
369369
switch (domain.getKind()) {
370370
case AvailabilityDomain::Kind::Universal:
371371
case AvailabilityDomain::Kind::Platform:
372-
case AvailabilityDomain::Kind::SwiftLanguage:
372+
case AvailabilityDomain::Kind::SwiftLanguageMode:
373373
case AvailabilityDomain::Kind::PackageDescription:
374374
return false;
375375

‎lib/AST/AvailabilityDomain.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ AvailabilityDomain::builtinDomainForString(StringRef string,
109109

110110
auto domain = llvm::StringSwitch<std::optional<AvailabilityDomain>>(string)
111111
.Case("*", AvailabilityDomain::forUniversal())
112-
.Case("swift", AvailabilityDomain::forSwiftLanguage())
112+
.Case("swift", AvailabilityDomain::forSwiftLanguageMode())
113113
.Case("_PackageDescription",
114114
AvailabilityDomain::forPackageDescription())
115115
.Default(std::nullopt);
@@ -128,7 +128,7 @@ bool AvailabilityDomain::isVersioned() const {
128128
case Kind::Universal:
129129
case Kind::Embedded:
130130
return false;
131-
case Kind::SwiftLanguage:
131+
case Kind::SwiftLanguageMode:
132132
case Kind::PackageDescription:
133133
case Kind::Platform:
134134
return true;
@@ -146,7 +146,7 @@ bool AvailabilityDomain::isVersionValid(
146146
case Kind::Universal:
147147
case Kind::Embedded:
148148
llvm_unreachable("unexpected domain kind");
149-
case Kind::SwiftLanguage:
149+
case Kind::SwiftLanguageMode:
150150
case Kind::PackageDescription:
151151
return true;
152152
case Kind::Platform:
@@ -162,7 +162,7 @@ bool AvailabilityDomain::supportsContextRefinement() const {
162162
switch (getKind()) {
163163
case Kind::Universal:
164164
case Kind::Embedded:
165-
case Kind::SwiftLanguage:
165+
case Kind::SwiftLanguageMode:
166166
case Kind::PackageDescription:
167167
return false;
168168
case Kind::Platform:
@@ -175,7 +175,7 @@ bool AvailabilityDomain::supportsQueries() const {
175175
switch (getKind()) {
176176
case Kind::Universal:
177177
case Kind::Embedded:
178-
case Kind::SwiftLanguage:
178+
case Kind::SwiftLanguageMode:
179179
case Kind::PackageDescription:
180180
return false;
181181
case Kind::Platform:
@@ -188,7 +188,7 @@ bool AvailabilityDomain::isActive(const ASTContext &ctx,
188188
bool forTargetVariant) const {
189189
switch (getKind()) {
190190
case Kind::Universal:
191-
case Kind::SwiftLanguage:
191+
case Kind::SwiftLanguageMode:
192192
case Kind::PackageDescription:
193193
case Kind::Embedded:
194194
return true;
@@ -216,7 +216,7 @@ getDeploymentVersion(const AvailabilityDomain &domain, const ASTContext &ctx) {
216216
case AvailabilityDomain::Kind::Embedded:
217217
case AvailabilityDomain::Kind::Custom:
218218
return std::nullopt;
219-
case AvailabilityDomain::Kind::SwiftLanguage:
219+
case AvailabilityDomain::Kind::SwiftLanguageMode:
220220
return ctx.LangOpts.EffectiveLanguageVersion;
221221
case AvailabilityDomain::Kind::PackageDescription:
222222
return ctx.LangOpts.PackageDescriptionVersion;
@@ -253,7 +253,7 @@ llvm::StringRef AvailabilityDomain::getNameForDiagnostics() const {
253253
switch (getKind()) {
254254
case Kind::Universal:
255255
return "*";
256-
case Kind::SwiftLanguage:
256+
case Kind::SwiftLanguageMode:
257257
return "Swift";
258258
case Kind::PackageDescription:
259259
return "PackageDescription";
@@ -270,7 +270,7 @@ llvm::StringRef AvailabilityDomain::getNameForAttributePrinting() const {
270270
switch (getKind()) {
271271
case Kind::Universal:
272272
return "*";
273-
case Kind::SwiftLanguage:
273+
case Kind::SwiftLanguageMode:
274274
return "swift";
275275
case Kind::PackageDescription:
276276
return "_PackageDescription";
@@ -301,7 +301,7 @@ bool AvailabilityDomain::contains(const AvailabilityDomain &other) const {
301301
switch (getKind()) {
302302
case Kind::Universal:
303303
return true;
304-
case Kind::SwiftLanguage:
304+
case Kind::SwiftLanguageMode:
305305
case Kind::PackageDescription:
306306
case Kind::Embedded:
307307
case Kind::Custom:
@@ -318,7 +318,7 @@ bool AvailabilityDomain::isRoot() const {
318318
switch (getKind()) {
319319
case AvailabilityDomain::Kind::Universal:
320320
case AvailabilityDomain::Kind::Embedded:
321-
case AvailabilityDomain::Kind::SwiftLanguage:
321+
case AvailabilityDomain::Kind::SwiftLanguageMode:
322322
case AvailabilityDomain::Kind::PackageDescription:
323323
return true;
324324
case AvailabilityDomain::Kind::Platform:
@@ -403,7 +403,7 @@ void AvailabilityDomain::print(llvm::raw_ostream &os) const {
403403
AvailabilityDomain AvailabilityDomain::copy(ASTContext &ctx) const {
404404
switch (getKind()) {
405405
case Kind::Universal:
406-
case Kind::SwiftLanguage:
406+
case Kind::SwiftLanguageMode:
407407
case Kind::PackageDescription:
408408
case Kind::Embedded:
409409
case Kind::Platform:
@@ -425,7 +425,7 @@ bool StableAvailabilityDomainComparator::operator()(
425425

426426
switch (lhsKind) {
427427
case AvailabilityDomain::Kind::Universal:
428-
case AvailabilityDomain::Kind::SwiftLanguage:
428+
case AvailabilityDomain::Kind::SwiftLanguageMode:
429429
case AvailabilityDomain::Kind::PackageDescription:
430430
case AvailabilityDomain::Kind::Embedded:
431431
return false;

‎lib/AST/AvailabilityQuery.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ FuncDecl *AvailabilityQuery::getDynamicQueryDeclAndArguments(
132132
auto domain = getDomain();
133133
switch (domain.getKind()) {
134134
case AvailabilityDomain::Kind::Universal:
135-
case AvailabilityDomain::Kind::SwiftLanguage:
135+
case AvailabilityDomain::Kind::SwiftLanguageMode:
136136
case AvailabilityDomain::Kind::PackageDescription:
137137
case AvailabilityDomain::Kind::Embedded:
138138
return nullptr;

‎lib/AST/AvailabilityScopeBuilder.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ class AvailabilityScopeBuilder : private ASTWalker {
847847

848848
switch (domain.getKind()) {
849849
case AvailabilityDomain::Kind::Embedded:
850-
case AvailabilityDomain::Kind::SwiftLanguage:
850+
case AvailabilityDomain::Kind::SwiftLanguageMode:
851851
case AvailabilityDomain::Kind::PackageDescription:
852852
// These domains don't support queries.
853853
llvm::report_fatal_error("unsupported domain");

‎lib/Sema/TypeCheckAvailability.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1701,7 +1701,7 @@ bool shouldHideDomainNameForConstraintDiagnostic(
17011701
return true;
17021702
case AvailabilityDomain::Kind::Platform:
17031703
return false;
1704-
case AvailabilityDomain::Kind::SwiftLanguage:
1704+
case AvailabilityDomain::Kind::SwiftLanguageMode:
17051705
switch (constraint.getReason()) {
17061706
case AvailabilityConstraint::Reason::UnavailableUnconditionally:
17071707
case AvailabilityConstraint::Reason::UnavailableUnintroduced:
@@ -2122,7 +2122,7 @@ bool diagnoseExplicitUnavailability(
21222122
return false;
21232123

21242124
auto Attr = constraint.getAttr();
2125-
if (Attr.getDomain().isSwiftLanguage() && !Attr.isVersionSpecific()) {
2125+
if (Attr.getDomain().isSwiftLanguageMode() && !Attr.isVersionSpecific()) {
21262126
if (shouldAllowReferenceToUnavailableInSwiftDeclaration(D, Where))
21272127
return false;
21282128
}
@@ -3097,7 +3097,7 @@ ExprAvailabilityWalker::diagnoseIncDecRemoval(const ValueDecl *D, SourceRange R)
30973097
// If we emit a deprecation diagnostic, produce a fixit hint as well.
30983098
auto diag =
30993099
Context.Diags.diagnose(R.Start, diag::availability_decl_unavailable, D,
3100-
true, AvailabilityDomain::forSwiftLanguage(),
3100+
true, AvailabilityDomain::forSwiftLanguageMode(),
31013101
"it has been removed in Swift 3");
31023102
if (isa<PrefixUnaryExpr>(call)) {
31033103
// Prefix: remove the ++ or --.
@@ -3146,7 +3146,7 @@ ExprAvailabilityWalker::diagnoseMemoryLayoutMigration(const ValueDecl *D,
31463146
EncodedDiagnosticMessage EncodedMessage(Attr.getMessage());
31473147
auto diag = Context.Diags.diagnose(
31483148
R.Start, diag::availability_decl_unavailable, D, true,
3149-
AvailabilityDomain::forSwiftLanguage(), EncodedMessage.Message);
3149+
AvailabilityDomain::forSwiftLanguageMode(), EncodedMessage.Message);
31503150
diag.highlight(R);
31513151

31523152
StringRef Prefix = "MemoryLayout<";

0 commit comments

Comments
 (0)