@@ -559,15 +559,15 @@ availabilityDomainsForABICompatibility(const ASTContext &ctx) {
559
559
return domains;
560
560
}
561
561
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) {
564
564
// Don't trust unavailability on declarations from Clang modules.
565
565
if (isa<ClangModuleUnit>(decl->getDeclContext ()->getModuleScopeContext ()))
566
- return SemanticDeclAvailability ::PotentiallyAvailable;
566
+ return DeclRuntimeAvailability ::PotentiallyAvailable;
567
567
568
568
// Check whether the decl is unavailable at all.
569
569
if (!decl->isUnavailable ())
570
- return SemanticDeclAvailability ::PotentiallyAvailable;
570
+ return DeclRuntimeAvailability ::PotentiallyAvailable;
571
571
572
572
auto &ctx = decl->getASTContext ();
573
573
auto compatibilityDomains = availabilityDomainsForABICompatibility (ctx);
@@ -615,42 +615,42 @@ static SemanticDeclAvailability getSemanticDeclAvailability(const Decl *decl) {
615
615
}
616
616
617
617
if (otherUnavailableDomainCount > 0 )
618
- return SemanticDeclAvailability ::AlwaysUnavailableABICompatible;
618
+ return DeclRuntimeAvailability ::AlwaysUnavailableABICompatible;
619
619
620
620
// Check whether the declaration has been marked unavailable in all
621
621
// compatibility domains. If it hasn't, then the declaration may be usable
622
622
// by some client compiled with different settings.
623
623
if (remainingCompatibilityDomains.size () > 0 )
624
- return SemanticDeclAvailability ::PotentiallyAvailable;
624
+ return DeclRuntimeAvailability ::PotentiallyAvailable;
625
625
626
- return SemanticDeclAvailability ::AlwaysUnavailableABICompatible;
626
+ return DeclRuntimeAvailability ::AlwaysUnavailableABICompatible;
627
627
}
628
628
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;
633
633
if (auto *parent =
634
634
AvailabilityInference::parentDeclForInferredAvailability (decl)) {
635
635
inherited = evaluateOrDefault (
636
- evaluator, SemanticDeclAvailabilityRequest {parent}, inherited);
636
+ evaluator, DeclRuntimeAvailabilityRequest {parent}, inherited);
637
637
}
638
638
639
639
// If the inherited semantic availability is already maximally unavailable
640
640
// 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;
643
643
644
- auto availability = getSemanticDeclAvailability (decl);
644
+ auto availability = getDeclRuntimeAvailability (decl);
645
645
return std::max (inherited, availability);
646
646
}
647
647
648
648
bool Decl::isUnreachableAtRuntime () const {
649
649
auto availability = evaluateOrDefault (
650
- getASTContext ().evaluator , SemanticDeclAvailabilityRequest {this },
651
- SemanticDeclAvailability ::PotentiallyAvailable);
650
+ getASTContext ().evaluator , DeclRuntimeAvailabilityRequest {this },
651
+ DeclRuntimeAvailability ::PotentiallyAvailable);
652
652
return availability ==
653
- SemanticDeclAvailability ::AlwaysUnavailableABICompatible;
653
+ DeclRuntimeAvailability ::AlwaysUnavailableABICompatible;
654
654
}
655
655
656
656
static UnavailableDeclOptimization
0 commit comments