@@ -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
652652bool 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
660660static UnavailableDeclOptimization
0 commit comments