@@ -315,25 +315,27 @@ AvailabilityContext ASTContext::getSwift52Availability() {
315
315
if (target.getArchName () == " arm64e" )
316
316
return AvailabilityContext::alwaysAvailable ();
317
317
318
- if (target.isMacOSX () ) {
318
+ if (target.isMacOSX ()) {
319
319
if (target.isAArch64 ())
320
320
return AvailabilityContext::alwaysAvailable ();
321
321
322
322
return AvailabilityContext (
323
- VersionRange::allGTE (llvm::VersionTuple (10 , 99 , 0 )));
323
+ VersionRange::allGTE (llvm::VersionTuple (10 , 15 , 4 )));
324
324
} else if (target.isiOS ()) {
325
325
if (target.isAArch64 () &&
326
326
(target.isSimulatorEnvironment () || target.isMacCatalystEnvironment ()))
327
327
return AvailabilityContext::alwaysAvailable ();
328
328
329
329
return AvailabilityContext (
330
- VersionRange::allGTE (llvm::VersionTuple (99 , 0 , 0 )));
330
+ VersionRange::allGTE (llvm::VersionTuple (13 , 4 , 0 )));
331
331
} else if (target.isWatchOS ()) {
332
+ if (target.isArch64Bit ())
333
+ return AvailabilityContext::alwaysAvailable ();
334
+
332
335
return AvailabilityContext (
333
- VersionRange::allGTE (llvm::VersionTuple (9 , 99 , 0 )));
334
- } else {
335
- return AvailabilityContext::alwaysAvailable ();
336
+ VersionRange::allGTE (llvm::VersionTuple (6 , 2 , 0 )));
336
337
}
338
+ return AvailabilityContext::alwaysAvailable ();
337
339
}
338
340
339
341
AvailabilityContext ASTContext::getSwift53Availability () {
@@ -346,18 +348,24 @@ AvailabilityContext ASTContext::getSwift53Availability() {
346
348
if (target.isAArch64 ())
347
349
return AvailabilityContext::alwaysAvailable ();
348
350
351
+ llvm::VersionTuple macOVersion53 (10 , 16 , 0 );
352
+ macOVersion53 = canonicalizePlatformVersion (PlatformKind::OSX, macOVersion53);
349
353
return AvailabilityContext (
350
- VersionRange::allGTE (llvm::VersionTuple (10 , 99 , 0 )));
354
+ VersionRange::allGTE (llvm::VersionTuple (10 , 16 , 0 )));
355
+ VersionRange::allGTE (macOVersion53));
351
356
} else if (target.isiOS ()) {
352
357
if (target.isAArch64 () &&
353
358
(target.isSimulatorEnvironment () || target.isMacCatalystEnvironment ()))
354
359
return AvailabilityContext::alwaysAvailable ();
355
360
356
361
return AvailabilityContext (
357
- VersionRange::allGTE (llvm::VersionTuple (99 , 0 , 0 )));
362
+ VersionRange::allGTE (llvm::VersionTuple (14 , 0 , 0 )));
358
363
} else if (target.isWatchOS ()) {
364
+ if (target.isArch64Bit ())
365
+ return AvailabilityContext::alwaysAvailable ();
366
+
359
367
return AvailabilityContext (
360
- VersionRange::allGTE (llvm::VersionTuple (9 , 99 , 0 )));
368
+ VersionRange::allGTE (llvm::VersionTuple (7 , 0 , 0 )));
361
369
} else {
362
370
return AvailabilityContext::alwaysAvailable ();
363
371
}
0 commit comments