averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35132 from slavapestov/optimize-is-unavailable

Browse Source 
Sema: Optimize ConstraintSystem::is{Decl,Conformance}Unavailable
This commit is contained in:
Slava Pestov
2020-12-17 13:06:41 -05:00
committed by GitHub
parent f694cfb99e 486562a191
commit 2c5abd88b0
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/Sema/ConstraintSystem.cpp
View File

@@ -5089,6 +5089,20 @@ bool ConstraintSystem::isDeclUnavailable(const Decl *D,
if (D->getAttrs().isUnavailable(ctx))
return true;
if (ctx.LangOpts.DisableAvailabilityChecking)
return false;
if (!DC->getParentSourceFile()) {
// We only check availability if this reference is in a source file; we do
// not check in other kinds of FileUnits.
return false;
}
AvailabilityContext safeRangeUnderApprox{
AvailabilityInference::availableRange(D, ctx)};
if (safeRangeUnderApprox.isAlwaysAvailable())
return false;
SourceLoc loc;
if (locator) {
@@ -5096,10 +5110,15 @@ bool ConstraintSystem::isDeclUnavailable(const Decl *D,
loc = getLoc(anchor);
}
// If not, let's check contextual unavailability.
ExportContext where = ExportContext::forFunctionBody(DC, loc);
auto result = TypeChecker::checkDeclarationAvailability(D, where);
return result.hasValue();
AvailabilityContext runningOSOverApprox =
TypeChecker::overApproximateAvailabilityAtLocation(loc, DC);
// The reference is safe if an over-approximation of the running OS
// versions is fully contained within an under-approximation
// of the versions on which the declaration is available. If this
// containment cannot be guaranteed, we say the reference is
// not available.
return !runningOSOverApprox.isContainedIn(safeRangeUnderApprox);
}
bool ConstraintSystem::isConformanceUnavailable(ProtocolConformanceRef conformance,
@@ -5113,24 +5132,7 @@ bool ConstraintSystem::isConformanceUnavailable(ProtocolConformanceRef conforman
if (ext == nullptr)
return false;
auto &ctx = getASTContext();
// First check whether this declaration is universally unavailable.
if (ext->getAttrs().isUnavailable(ctx))
return true;
SourceLoc loc;
if (locator) {
if (auto anchor = locator->getAnchor())
loc = getLoc(anchor);
}
// If not, let's check contextual unavailability.
ExportContext where = ExportContext::forFunctionBody(DC, loc);
auto result = TypeChecker::checkConformanceAvailability(
rootConf, ext, where);
return result.hasValue();
return isDeclUnavailable(ext, locator);
}
/// If we aren't certain that we've emitted a diagnostic, emit a fallback