Skip to content

Commit 24eb380

Browse files
committed
AST: Rename SemanticDeclAvailability to DeclRuntimeAvailability.
1 parent 2d63a7c commit 24eb380

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

include/swift/AST/TypeCheckRequests.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4134,7 +4134,7 @@ class RenamedDeclRequest
41344134
///
41354135
/// The elements of this enumeration must be ordered from most available to
41364136
/// least available.
4137-
enum class SemanticDeclAvailability : uint8_t {
4137+
enum class DeclRuntimeAvailability : uint8_t {
41384138
/// The decl is potentially available at runtime. If it is unavailable at
41394139
/// compile time in the current module, it may still be considered available
41404140
/// at compile time by other modules with different settings. For example, a
@@ -4155,18 +4155,18 @@ enum class SemanticDeclAvailability : uint8_t {
41554155
AlwaysUnavailableABICompatible,
41564156
};
41574157

4158-
class SemanticDeclAvailabilityRequest
4159-
: public SimpleRequest<SemanticDeclAvailabilityRequest,
4160-
SemanticDeclAvailability(const Decl *decl),
4158+
class DeclRuntimeAvailabilityRequest
4159+
: public SimpleRequest<DeclRuntimeAvailabilityRequest,
4160+
DeclRuntimeAvailability(const Decl *decl),
41614161
RequestFlags::Cached> {
41624162
public:
41634163
using SimpleRequest::SimpleRequest;
41644164

41654165
private:
41664166
friend SimpleRequest;
41674167

4168-
SemanticDeclAvailability evaluate(Evaluator &evaluator,
4169-
const Decl *decl) const;
4168+
DeclRuntimeAvailability evaluate(Evaluator &evaluator,
4169+
const Decl *decl) const;
41704170

41714171
public:
41724172
bool isCached() const { return true; }

include/swift/AST/TypeCheckerTypeIDZone.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@ SWIFT_REQUEST(TypeChecker, ImplicitKnownProtocolConformanceRequest,
473473
SWIFT_REQUEST(TypeChecker, RenamedDeclRequest,
474474
ValueDecl *(const ValueDecl *, const AvailableAttr *),
475475
Cached, NoLocationInfo)
476-
SWIFT_REQUEST(TypeChecker, SemanticDeclAvailabilityRequest,
477-
SemanticDeclAvailability(const Decl *),
476+
SWIFT_REQUEST(TypeChecker, DeclRuntimeAvailabilityRequest,
477+
DeclRuntimeAvailability(const Decl *),
478478
Cached, NoLocationInfo)
479479
SWIFT_REQUEST(TypeChecker, ClosureEffectsRequest,
480480
FunctionType::ExtInfo(ClosureExpr *),

lib/AST/Availability.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ availabilityDomainsForABICompatibility(const ASTContext &ctx) {
559559
return domains;
560560
}
561561

562-
/// Computes the `SemanticDeclAvailability` value for `decl`.
563-
static SemanticDeclAvailability getSemanticDeclAvailability(const Decl *decl) {
562+
/// Computes the `DeclRuntimeAvailability` value for `decl`.
563+
static DeclRuntimeAvailability getDeclRuntimeAvailability(const Decl *decl) {
564564
// Don't trust unavailability on declarations from Clang modules.
565565
if (isa<ClangModuleUnit>(decl->getDeclContext()->getModuleScopeContext()))
566-
return SemanticDeclAvailability::PotentiallyAvailable;
566+
return DeclRuntimeAvailability::PotentiallyAvailable;
567567

568568
// Check whether the decl is unavailable at all.
569569
if (!decl->isUnavailable())
570-
return SemanticDeclAvailability::PotentiallyAvailable;
570+
return DeclRuntimeAvailability::PotentiallyAvailable;
571571

572572
auto &ctx = decl->getASTContext();
573573
auto compatibilityDomains = availabilityDomainsForABICompatibility(ctx);
@@ -615,42 +615,42 @@ static SemanticDeclAvailability getSemanticDeclAvailability(const Decl *decl) {
615615
}
616616

617617
if (otherUnavailableDomainCount > 0)
618-
return SemanticDeclAvailability::AlwaysUnavailableABICompatible;
618+
return DeclRuntimeAvailability::AlwaysUnavailableABICompatible;
619619

620620
// Check whether the declaration has been marked unavailable in all
621621
// compatibility domains. If it hasn't, then the declaration may be usable
622622
// by some client compiled with different settings.
623623
if (remainingCompatibilityDomains.size() > 0)
624-
return SemanticDeclAvailability::PotentiallyAvailable;
624+
return DeclRuntimeAvailability::PotentiallyAvailable;
625625

626-
return SemanticDeclAvailability::AlwaysUnavailableABICompatible;
626+
return DeclRuntimeAvailability::AlwaysUnavailableABICompatible;
627627
}
628628

629-
SemanticDeclAvailability
630-
SemanticDeclAvailabilityRequest::evaluate(Evaluator &evaluator,
631-
const Decl *decl) const {
632-
auto inherited = SemanticDeclAvailability::PotentiallyAvailable;
629+
DeclRuntimeAvailability
630+
DeclRuntimeAvailabilityRequest::evaluate(Evaluator &evaluator,
631+
const Decl *decl) const {
632+
auto inherited = DeclRuntimeAvailability::PotentiallyAvailable;
633633
if (auto *parent =
634634
AvailabilityInference::parentDeclForInferredAvailability(decl)) {
635635
inherited = evaluateOrDefault(
636-
evaluator, SemanticDeclAvailabilityRequest{parent}, inherited);
636+
evaluator, DeclRuntimeAvailabilityRequest{parent}, inherited);
637637
}
638638

639639
// If the inherited semantic availability is already maximally unavailable
640640
// then skip computing unavailability for this declaration.
641-
if (inherited == SemanticDeclAvailability::AlwaysUnavailableABICompatible)
642-
return SemanticDeclAvailability::AlwaysUnavailableABICompatible;
641+
if (inherited == DeclRuntimeAvailability::AlwaysUnavailableABICompatible)
642+
return DeclRuntimeAvailability::AlwaysUnavailableABICompatible;
643643

644-
auto availability = getSemanticDeclAvailability(decl);
644+
auto availability = getDeclRuntimeAvailability(decl);
645645
return std::max(inherited, availability);
646646
}
647647

648648
bool Decl::isUnreachableAtRuntime() const {
649649
auto availability = evaluateOrDefault(
650-
getASTContext().evaluator, SemanticDeclAvailabilityRequest{this},
651-
SemanticDeclAvailability::PotentiallyAvailable);
650+
getASTContext().evaluator, DeclRuntimeAvailabilityRequest{this},
651+
DeclRuntimeAvailability::PotentiallyAvailable);
652652
return availability ==
653-
SemanticDeclAvailability::AlwaysUnavailableABICompatible;
653+
DeclRuntimeAvailability::AlwaysUnavailableABICompatible;
654654
}
655655

656656
static UnavailableDeclOptimization

0 commit comments

Comments
 (0)