[Apple Silicon] [Platform] Baseline arm64 simulators at iOS/tvOS 14.0 and watchOS 7.0.

Author: shahmishal

lib/AST/Availability.cpp

@@ -324,25 +324,27 @@ AvailabilityContext ASTContext::getSwift52Availability() {
   if (target.getArchName() == "arm64e")
     return AvailabilityContext::alwaysAvailable();
 
-  if (target.isMacOSX() ) {
+  if (target.isMacOSX()) {
     if (target.isAArch64())
       return AvailabilityContext::alwaysAvailable();
 
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(10, 99, 0)));
+        VersionRange::allGTE(llvm::VersionTuple(10, 15, 4)));
   } else if (target.isiOS()) {
     if (target.isAArch64() &&
         (target.isSimulatorEnvironment() || target.isMacCatalystEnvironment()))
       return AvailabilityContext::alwaysAvailable();
 
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(99, 0, 0)));
+        VersionRange::allGTE(llvm::VersionTuple(13, 4, 0)));
   } else if (target.isWatchOS()) {
+    if (target.isArch64Bit())
+      return AvailabilityContext::alwaysAvailable();
+
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(9, 99, 0)));
-  } else {
-    return AvailabilityContext::alwaysAvailable();
+        VersionRange::allGTE(llvm::VersionTuple(6, 2, 0)));
   }
+  return AvailabilityContext::alwaysAvailable();
 }
 
 AvailabilityContext ASTContext::getSwift53Availability() {
@@ -355,18 +357,24 @@ AvailabilityContext ASTContext::getSwift53Availability() {
     if (target.isAArch64())
       return AvailabilityContext::alwaysAvailable();
 
+    llvm::VersionTuple macOVersion53(10, 16, 0);
+    macOVersion53 = canonicalizePlatformVersion(PlatformKind::OSX, macOVersion53);
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(10, 99, 0)));
+        VersionRange::allGTE(llvm::VersionTuple(10, 16, 0)));
+        VersionRange::allGTE(macOVersion53));
   } else if (target.isiOS()) {
     if (target.isAArch64() &&
         (target.isSimulatorEnvironment() || target.isMacCatalystEnvironment()))
       return AvailabilityContext::alwaysAvailable();
 
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(99, 0, 0)));
+        VersionRange::allGTE(llvm::VersionTuple(14, 0, 0)));
   } else if (target.isWatchOS()) {
+    if (target.isArch64Bit())
+      return AvailabilityContext::alwaysAvailable();
+
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(9, 99, 0)));
+        VersionRange::allGTE(llvm::VersionTuple(7, 0, 0)));
   } else {
     return AvailabilityContext::alwaysAvailable();
   }

lib/Driver/DarwinToolChains.cpp

@@ -632,6 +632,16 @@ toolchains::Darwin::addDeploymentTargetArgs(ArgStringList &Arguments,
       case DarwinPlatformKind::TvOS:
       case DarwinPlatformKind::TvOSSimulator:
         triple.getiOSVersion(major, minor, micro);
+
+        // The first deployment of arm64 simulators is iOS/tvOS 14.0;
+        // the linker doesn't want to see a deployment target before that.
+        if (triple.isSimulatorEnvironment() && triple.isAArch64() &&
+            major < 14) {
+          major = 14;
+          minor = 0;
+          micro = 0;
+        }
+
         break;
       case DarwinPlatformKind::WatchOS:
       case DarwinPlatformKind::WatchOSSimulator:

test/Driver/linker.swift

@@ -113,13 +113,22 @@
 // RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx11.0 %s 2>&1 | %FileCheck -check-prefix X86_MACOS11_LINKER %s
 // RUN: %swiftc_driver -sdk "" -driver-print-jobs -target arm64-apple-macosx11.0 %s 2>&1 | %FileCheck -check-prefix ARM64E_MACOS_LINKER %s
 
+// Check arm64 simulators first deployment version adjustment.
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target arm64-apple-ios13.0-simulator %s 2>&1 | %FileCheck -check-prefix ARM64_IOS_SIMULATOR_LINKER %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target arm64-apple-tvos13.0-simulator %s 2>&1 | %FileCheck -check-prefix ARM64_TVOS_SIMULATOR_LINKER %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target arm64-apple-watchos5.0-simulator %s 2>&1 | %FileCheck -check-prefix ARM64_WATCHOS_SIMULATOR_LINKER %s
+
+
 // MACOS_10_15: -platform_version macos 10.9.0 10.15.0
 // MACOS_10_15_4: -platform_version macos 10.9.0 10.15.4
 // MACOS_UNVERSIONED: -platform_version macos 10.9.0 0.0.0
 
 // ARM64E_MACOS_LINKER: -platform_version macos 11.0.0
 // X86_MACOS11_LINKER: -platform_version macos 10.16.0
 // X86_64_WATCHOS_SIM_LINKER: -platform_version watchos-simulator 7.0.0
+// ARM64_IOS_SIMULATOR_LINKER: -platform_version ios-simulator 14.0.0
+// ARM64_TVOS_SIMULATOR_LINKER: -platform_version tvos-simulator 14.0.0
+// ARM64_WATCHOS_SIMULATOR_LINKER: -platform_version watchos-simulator 7.0.0
 
 // There are more RUN lines further down in the file.