Skip to content

Commit d19d4ee

Browse files
committed
IRGen: Use AvailabilityRange::forDeploymentTarget().
It should be preferred over querying the deployment range from the availability domain returned by `ASTContext::getTargetAvailabilityDomain()`. NFC.
1 parent d0929b6 commit d19d4ee

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

lib/IRGen/GenCoro.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,8 @@ class GetDeallocThroughFn {
110110
return emitNewLayoutOffsetIntoTask(task);
111111
}
112112
auto deploymentRange =
113-
IGM.Context.getTargetAvailabilityDomain().getDeploymentRange(
114-
IGM.Context);
115-
if (!deploymentRange || deploymentRange->isContainedIn(
116-
IGM.Context.getSwift57Availability())) {
113+
AvailabilityRange::forDeploymentTarget(IGM.Context);
114+
if (deploymentRange.isContainedIn(IGM.Context.getSwift57Availability())) {
117115
return emitNewLayoutOffsetIntoTask(task);
118116
}
119117

@@ -229,13 +227,12 @@ class GetDeallocThroughFn {
229227
llvm::Value *emitSwift57VersionCheck() {
230228
auto availability = IGM.Context.getSwift57Availability();
231229
auto deploymentRange =
232-
IGM.Context.getTargetAvailabilityDomain().getDeploymentRange(
233-
IGM.Context);
234-
assert(deploymentRange);
235-
assert(!deploymentRange->isContainedIn(
236-
IGM.Context.getSwift57Availability()));
230+
AvailabilityRange::forDeploymentTarget(IGM.Context);
231+
assert(!deploymentRange.isContainedIn(availability));
237232
(void)deploymentRange;
238233
assert(availability.hasMinimumVersion());
234+
// FIXME: [availability] This does not generate the correct query for
235+
// macCatalyst or zippered targets (rdar://155999964).
239236
auto version = availability.getRawMinimumVersion();
240237
auto *major = getInt32Constant(version.getMajor());
241238
auto *minor = getInt32Constant(version.getMinor());

0 commit comments

Comments
 (0)