AST: Re-map macOS 16 aligned availability versions to 26.

- watchOS 12 -> 26
- visionOS 3 -> 26
- macos 16 -> 26
- iOS 19 -> 26
- tvOS 19 -> 26

The version numbers for `if #available(...)` queries are intentionally not
re-mapped.

Author: tshortli

lib/AST/PlatformKind.cpp

@@ -263,16 +263,41 @@ bool swift::inheritsAvailabilityFromPlatform(PlatformKind Child,
   return false;
 }
 
-llvm::VersionTuple swift::canonicalizePlatformVersion(
-    PlatformKind platform, const llvm::VersionTuple &version) {
-
-  // Canonicalize macOS version for macOS Big Sur to treat
-  // 10.16 as 11.0.
-  if (platform == PlatformKind::macOS ||
-      platform == PlatformKind::macOSApplicationExtension) {
-    return llvm::Triple::getCanonicalVersionForOS(llvm::Triple::MacOSX,
-                                                  version);
+static std::optional<llvm::Triple::OSType>
+tripleOSTypeForPlatform(PlatformKind platform) {
+  switch (platform) {
+  case PlatformKind::macOS:
+  case PlatformKind::macOSApplicationExtension:
+    return llvm::Triple::MacOSX;
+  case PlatformKind::iOS:
+  case PlatformKind::iOSApplicationExtension:
+  case PlatformKind::macCatalyst:
+  case PlatformKind::macCatalystApplicationExtension:
+    return llvm::Triple::IOS;
+  case PlatformKind::tvOS:
+  case PlatformKind::tvOSApplicationExtension:
+    return llvm::Triple::TvOS;
+  case PlatformKind::watchOS:
+  case PlatformKind::watchOSApplicationExtension:
+    return llvm::Triple::WatchOS;
+  case PlatformKind::visionOS:
+  case PlatformKind::visionOSApplicationExtension:
+    return llvm::Triple::XROS;
+  case PlatformKind::OpenBSD:
+    return llvm::Triple::OpenBSD;
+  case PlatformKind::Windows:
+    return llvm::Triple::Win32;
+  case PlatformKind::none:
+    return std::nullopt;
   }
+  llvm_unreachable("bad PlatformKind");
+}
+
+llvm::VersionTuple
+swift::canonicalizePlatformVersion(PlatformKind platform,
+                                   const llvm::VersionTuple &version) {
+  if (auto osType = tripleOSTypeForPlatform(platform))
+    return llvm::Triple::getCanonicalVersionForOS(*osType, version);
 
   return version;
 }

test/ClangImporter/Inputs/custom-modules/MacOSVersionCanonicalization.h

@@ -4,8 +4,20 @@ void FunctionIntroducedIn10_16();
 __attribute__((availability(macosx,introduced=11.0)))
 void FunctionIntroducedIn11_0();
 
+__attribute__((availability(macosx,introduced=16.0)))
+void FunctionIntroducedIn16_0();
+
+__attribute__((availability(macosx,introduced=26.0)))
+void FunctionIntroducedIn26_0();
+
 __attribute__((availability(macosx_app_extension,introduced=10.16)))
 void FunctionIntroducedIn10_16AppExt();
 
 __attribute__((availability(macosx_app_extension,introduced=11.0)))
 void FunctionIntroducedIn11_0AppExt();
+
+__attribute__((availability(macosx_app_extension,introduced=16.0)))
+void FunctionIntroducedIn16_0AppExt();
+
+__attribute__((availability(macosx_app_extension,introduced=26.0)))
+void FunctionIntroducedIn26_0AppExt();

test/ClangImporter/availability_macosx_canonical_versions.swift

@@ -11,3 +11,11 @@ FunctionIntroducedIn10_16()
 FunctionIntroducedIn11_0()
 // expected-error@-1 {{'FunctionIntroducedIn11_0()' is only available in macOS 11.0 or newer}}
 // expected-note@-2 {{add 'if #available' version check}}
+
+FunctionIntroducedIn16_0()
+// expected-error@-1 {{'FunctionIntroducedIn16_0()' is only available in macOS 26.0 or newer}}
+// expected-note@-2 {{add 'if #available' version check}}
+
+FunctionIntroducedIn26_0()
+// expected-error@-1 {{'FunctionIntroducedIn26_0()' is only available in macOS 26.0 or newer}}
+// expected-note@-2 {{add 'if #available' version check}}

test/ClangImporter/availability_macosx_canonical_versions_appext.swift

@@ -11,3 +11,11 @@ FunctionIntroducedIn10_16AppExt()
 FunctionIntroducedIn11_0AppExt()
 // expected-error@-1 {{'FunctionIntroducedIn11_0AppExt()' is only available in application extensions for macOS 11.0 or newer}}
 // expected-note@-2 {{add 'if #available' version check}}
+
+FunctionIntroducedIn16_0AppExt()
+// expected-error@-1 {{'FunctionIntroducedIn16_0AppExt()' is only available in application extensions for macOS 26.0 or newer}}
+// expected-note@-2 {{add 'if #available' version check}}
+
+FunctionIntroducedIn26_0AppExt()
+// expected-error@-1 {{'FunctionIntroducedIn26_0AppExt()' is only available in application extensions for macOS 26.0 or newer}}
+// expected-note@-2 {{add 'if #available' version check}}

test/IDE/print_ast_tc_decls_canonical_versions.swift

@@ -0,0 +1,21 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck -verify %s
+// RUN: %target-swift-ide-test -skip-deinit=false -print-ast-typechecked -source-filename %s -function-definitions=false -prefer-type-repr=false -print-implicit-attrs=true > %t.printed.txt
+// RUN: %FileCheck %s -check-prefix=PASS_COMMON -strict-whitespace < %t.printed.txt
+
+@available(iOS 10.16, OSX 10.16, *)
+func introduced10_16() {}
+// PASS_COMMON: {{^}}@available(iOS 10.16, macOS 11.0, *){{$}}
+// PASS_COMMON-NEXT: {{^}}func introduced10_16(){{$}}
+
+@available(macOS 16.0, iOS 19.0, macCatalyst 19.0, watchOS 12.0, tvOS 19.0, visionOS 3.0, *)
+func introducedInVersionsMappingTo26_0() {}
+// FIXME: visionOS and macCatalyst are missing
+// PASS_COMMON: {{^}}@available(macOS 26.0, iOS 26.0, watchOS 26.0, tvOS 26.0, *){{$}}
+// PASS_COMMON-NEXT: {{^}}func introducedInVersionsMappingTo26_0(){{$}}
+
+@available(macOS 18.0, iOS 21.0, macCatalyst 21.0, watchOS 14.0, tvOS 21.0, visionOS 5.0, *)
+func introducedInVersionsMappingTo28_0() {}
+// FIXME: visionOS and macCatalyst are missing
+// PASS_COMMON: {{^}}@available(macOS 28.0, iOS 28.0, watchOS 28.0, tvOS 28.0, *){{$}}
+// PASS_COMMON-NEXT: {{^}}func introducedInVersionsMappingTo28_0(){{$}}

test/IDE/print_ast_tc_decls_macosx_canonical_versions.swift

@@ -6,7 +6,7 @@
 
 // CHECK: target triple = "{{.*}}-apple-macosx{{[0-9][0-9]}}.
 // CHECK-SPECIFIC-MAC-10-X: target triple = "{{.*}}-apple-macosx10.51.0"
-// CHECK-DARWIN-OVER-11: target triple = "{{.*}}-apple-macosx46.0.0"
+// CHECK-DARWIN-OVER-11: target triple = "{{.*}}-apple-macosx56.0.0"
 
 public func anchor() {}
 anchor()

test/IRGen/osx-targets.swift

@@ -0,0 +1,34 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-emit-module-interface(%t/Module.swiftinterface) %s
+// RUN: %target-swift-typecheck-module-from-interface(%t/Module.swiftinterface)
+// RUN: %FileCheck %s < %t/Module.swiftinterface
+
+@available(macOS 10.16, iOS 10.16, watchOS 10.16, tvOS 10.16, *)
+public func introduced10_16() { }
+// CHECK: @available(macOS 11.0, iOS 10.16, watchOS 10.16, tvOS 10.16, *)
+// CHECK-NEXT: public func introduced10_16()
+
+@available(OSX 11.0, iOS 11.0, watchOS 11.0, tvOS 11.0, *)
+public func introduced11_0() { }
+// CHECK-NEXT: @available(macOS 11.0, iOS 11.0, watchOS 11.0, tvOS 11.0, *)
+// CHECK-NEXT: public func introduced11_0()
+
+@available(macOS 16.0, iOS 19.0, macCatalyst 19.0, watchOS 12.0, tvOS 19.0, visionOS 3.0, *)
+public func introducedInVersionsMappingTo26_0() { }
+// CHECK-NEXT: @available(macOS 26.0, iOS 26.0, macCatalyst 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
+// CHECK-NEXT: public func introducedInVersionsMappingTo26_0()
+
+@available(macOS 17.0, iOS 20.0, macCatalyst 20.0, watchOS 13.0, tvOS 20.0, visionOS 4.0, *)
+public func introducedInInvalidVersionsMappingTo27_0() { }
+// CHECK-NEXT: @available(macOS 27.0, iOS 27.0, macCatalyst 27.0, watchOS 27.0, tvOS 27.0, visionOS 27.0, *)
+// CHECK-NEXT: public func introducedInInvalidVersionsMappingTo27_0()
+
+@available(macOS 19.1.1, iOS 21, macCatalyst 21.0, watchOS 14.5.1, tvOS 21.2.3, visionOS 4.0.1, *)
+public func introducedInInvalidVersionsWithVaryingComponents() { }
+// CHECK-NEXT: @available(macOS 29.1.1, iOS 28, macCatalyst 28.0, watchOS 28.5.1, tvOS 28.2.3, visionOS 27.0.1, *)
+// CHECK-NEXT: public func introducedInInvalidVersionsWithVaryingComponents()
+
+@available(macOS 26.0, iOS 26.0, macCatalyst 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
+public func introduced26_0() { }
+// CHECK-NEXT: @available(macOS 26.0, iOS 26.0, macCatalyst 26.0, watchOS 26.0, tvOS 26.0, visionOS 26.0, *)
+// CHECK-NEXT: public func introduced26_0()

test/ModuleInterface/availability-canonical-version.swift

@@ -0,0 +1,47 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t %s -disable-objc-attr-requires-foundation-module
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library %t/availability_canonical_versions.swiftmodule -typecheck -verify -emit-objc-header-path %t/availability.h -import-objc-header %S/../Inputs/empty.h -disable-objc-attr-requires-foundation-module
+// RUN: %FileCheck %s < %t/availability.h
+// RUN: %check-in-clang %t/availability.h
+
+// REQUIRES: objc_interop
+
+// CHECK-LABEL: @interface Availability{{$}}
+@objc class Availability {
+  // CHECK-NEXT: - (void)alwaysAvailable;
+  @objc func alwaysAvailable() {}
+
+  // CHECK-NEXT: - (void)introducedOn10_16
+  // CHECK-SAME: SWIFT_AVAILABILITY(ios,introduced=10.16)
+  // CHECK-SAME: SWIFT_AVAILABILITY(macos,introduced=11.0)
+  @available(macOS 10.16, *)
+  @available(iOS, introduced: 10.16)
+  @objc func introducedOn10_16() {}
+
+  // CHECK-NEXT: - (void)introducedOn11_0
+  // CHECK-SAME: SWIFT_AVAILABILITY(ios,introduced=11.0)
+  // CHECK-SAME: SWIFT_AVAILABILITY(macos,introduced=11.0)
+  @available(macOS 11.0, *)
+  @available(iOS, introduced: 11.0)
+  @objc func introducedOn11_0() {}
+
+  // CHECK-NEXT: - (void)introducedOnVersionsMappingTo26_0
+  // CHECK-SAME: SWIFT_AVAILABILITY(visionos,introduced=26.0)
+  // CHECK-SAME: SWIFT_AVAILABILITY(tvos,introduced=26.0)
+  // CHECK-SAME: SWIFT_AVAILABILITY(watchos,introduced=26.0)
+  // CHECK-SAME: SWIFT_AVAILABILITY(maccatalyst,introduced=26.0)
+  // CHECK-SAME: SWIFT_AVAILABILITY(ios,introduced=26.0)
+  // CHECK-SAME: SWIFT_AVAILABILITY(macos,introduced=26.0)
+  @available(macOS 16.0, iOS 19.0, macCatalyst 19.0, watchOS 12.0, tvOS 19.0, visionOS 3.0, *)
+  @objc func introducedOnVersionsMappingTo26_0() {}
+
+  // CHECK-NEXT: - (void)introducedOn26_0
+  // CHECK-SAME: SWIFT_AVAILABILITY(visionos,introduced=26.0)
+  // CHECK-SAME: SWIFT_AVAILABILITY(watchos,introduced=26.0)
+  // CHECK-SAME: SWIFT_AVAILABILITY(tvos,introduced=26.0)
+  // CHECK-SAME: SWIFT_AVAILABILITY(maccatalyst,introduced=26.0)
+  // CHECK-SAME: SWIFT_AVAILABILITY(ios,introduced=26.0)
+  // CHECK-SAME: SWIFT_AVAILABILITY(macos,introduced=26.0)
+  @available(macOS 26.0, iOS 26.0, macCatalyst 26.0, tvOS 26.0, watchOS 26.0, visionOS 26.0, *)
+  @objc func introducedOn26_0() {}
+}