Skip to content

Commit 0d581c4

Browse files
committed
NFC: Use VersionRange::all() to represent "always available".
It doesn't make sense to use `VersionRange::empty()` to represent "universally available" since something that is available in an empty version range is effectively never available.
1 parent a24c448 commit 0d581c4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/IRGen/GenMeta.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2535,7 +2535,7 @@ namespace {
25352535

25362536
SmallVector<llvm::BasicBlock *, 4> conditionalTypes;
25372537

2538-
// Pre-allocate a basic block per condition, so there it's
2538+
// Pre-allocate a basic block per condition, so that it's
25392539
// possible to jump between conditions.
25402540
for (unsigned index : indices(substitutionSet)) {
25412541
conditionalTypes.push_back(
@@ -2619,7 +2619,7 @@ namespace {
26192619
auto universal = substitutionSet.back();
26202620

26212621
assert(universal->getAvailability().size() == 1 &&
2622-
universal->getAvailability()[0].first.isEmpty());
2622+
universal->getAvailability()[0].first.isAll());
26232623

26242624
IGF.Builder.CreateRet(
26252625
getResultValue(IGF, genericEnv, universal->getSubstitutions()));

lib/Sema/MiscDiagnostics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3631,7 +3631,7 @@ class OpaqueUnderlyingTypeChecker : public ASTWalker {
36313631
// Add universally available choice as the last one.
36323632
conditionalSubstitutions.push_back(
36333633
OpaqueTypeDecl::ConditionallyAvailableSubstitutions::get(
3634-
Ctx, {{VersionRange::empty(), /*unavailable=*/false}},
3634+
Ctx, {{VersionRange::all(), /*unavailable=*/false}},
36353635
std::get<1>(universallyAvailable)
36363636
.mapReplacementTypesOutOfContext()));
36373637

lib/Serialization/Deserialization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4559,7 +4559,7 @@ class DeclDeserializer {
45594559
} else {
45604560
limitedAvailability.push_back(
45614561
OpaqueTypeDecl::ConditionallyAvailableSubstitutions::get(
4562-
ctx, {{VersionRange::empty(), /*unavailability=*/false}},
4562+
ctx, {{VersionRange::all(), /*unavailability=*/false}},
45634563
subMapOrError.get()));
45644564

45654565
opaqueDecl->setConditionallyAvailableSubstitutions(limitedAvailability);

0 commit comments

Comments
 (0)