Skip to content

Commit 7ed2a0d

Browse files
committed
AST: Rename SemanticDeclAvailability to DeclRuntimeAvailability.
1 parent 2309793 commit 7ed2a0d

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
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: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -572,15 +572,15 @@ static bool constraintIndicatesRuntimeUnavailability(
572572
}
573573
}
574574

575-
/// Computes the `SemanticDeclAvailability` value for `decl`.
576-
static SemanticDeclAvailability getSemanticDeclAvailability(const Decl *decl) {
575+
/// Computes the `DeclRuntimeAvailability` value for `decl`.
576+
static DeclRuntimeAvailability getDeclRuntimeAvailability(const Decl *decl) {
577577
// Don't trust unavailability on declarations from Clang modules.
578578
if (isa<ClangModuleUnit>(decl->getDeclContext()->getModuleScopeContext()))
579-
return SemanticDeclAvailability::PotentiallyAvailable;
579+
return DeclRuntimeAvailability::PotentiallyAvailable;
580580

581581
// Check whether the decl is unavailable at all.
582582
if (!decl->isUnavailable())
583-
return SemanticDeclAvailability::PotentiallyAvailable;
583+
return DeclRuntimeAvailability::PotentiallyAvailable;
584584

585585
auto &ctx = decl->getASTContext();
586586
auto compatibilityDomains = availabilityDomainsForABICompatibility(ctx);
@@ -624,37 +624,37 @@ static SemanticDeclAvailability getSemanticDeclAvailability(const Decl *decl) {
624624

625625
// Either every compatibility domain has been proven unavailable or this
626626
// constraint proves runtime unavailability on its own.
627-
return SemanticDeclAvailability::AlwaysUnavailableABICompatible;
627+
return DeclRuntimeAvailability::AlwaysUnavailableABICompatible;
628628
}
629629

630-
return SemanticDeclAvailability::PotentiallyAvailable;
630+
return DeclRuntimeAvailability::PotentiallyAvailable;
631631
}
632632

633-
SemanticDeclAvailability
634-
SemanticDeclAvailabilityRequest::evaluate(Evaluator &evaluator,
635-
const Decl *decl) const {
636-
auto inherited = SemanticDeclAvailability::PotentiallyAvailable;
633+
DeclRuntimeAvailability
634+
DeclRuntimeAvailabilityRequest::evaluate(Evaluator &evaluator,
635+
const Decl *decl) const {
636+
auto inherited = DeclRuntimeAvailability::PotentiallyAvailable;
637637
if (auto *parent =
638638
AvailabilityInference::parentDeclForInferredAvailability(decl)) {
639639
inherited = evaluateOrDefault(
640-
evaluator, SemanticDeclAvailabilityRequest{parent}, inherited);
640+
evaluator, DeclRuntimeAvailabilityRequest{parent}, inherited);
641641
}
642642

643643
// If the inherited semantic availability is already maximally unavailable
644644
// then skip computing unavailability for this declaration.
645-
if (inherited == SemanticDeclAvailability::AlwaysUnavailableABICompatible)
646-
return SemanticDeclAvailability::AlwaysUnavailableABICompatible;
645+
if (inherited == DeclRuntimeAvailability::AlwaysUnavailableABICompatible)
646+
return DeclRuntimeAvailability::AlwaysUnavailableABICompatible;
647647

648-
auto availability = getSemanticDeclAvailability(decl);
648+
auto availability = getDeclRuntimeAvailability(decl);
649649
return std::max(inherited, availability);
650650
}
651651

652652
bool Decl::isUnreachableAtRuntime() const {
653653
auto availability = evaluateOrDefault(
654-
getASTContext().evaluator, SemanticDeclAvailabilityRequest{this},
655-
SemanticDeclAvailability::PotentiallyAvailable);
654+
getASTContext().evaluator, DeclRuntimeAvailabilityRequest{this},
655+
DeclRuntimeAvailability::PotentiallyAvailable);
656656
return availability ==
657-
SemanticDeclAvailability::AlwaysUnavailableABICompatible;
657+
DeclRuntimeAvailability::AlwaysUnavailableABICompatible;
658658
}
659659

660660
static UnavailableDeclOptimization

0 commit comments

Comments
 (0)