SE-0106: Add "macOS" as an alias for "OSX" in #available.

...and @available.

Later commits will switch which one is the default.

Author: jrose-apple

lib/AST/PlatformKind.cpp

@@ -51,6 +51,8 @@ Optional<PlatformKind> swift::platformFromString(StringRef Name) {
   return llvm::StringSwitch<Optional<PlatformKind>>(Name)
 #define AVAILABILITY_PLATFORM(X, PrettyName) .Case(#X, PlatformKind::X)
 #include "swift/AST/PlatformKinds.def"
+      .Case("macOS", PlatformKind::OSX)
+      .Case("macOSApplicationExtension", PlatformKind::OSXApplicationExtension)
       .Default(Optional<PlatformKind>());
 }
 

test/Parse/availability_query.swift

@@ -99,5 +99,8 @@ if 1 != 2, #available(iOS 8.0, *) {}
 if case 42 = 42, #available(iOS 8.0, *) {}
 if let x = Optional(42), #available(iOS 8.0, *) {}
 
+// Allow "macOS" as well.
+if #available(macOS 10.51, *) {
+}
 
 

test/SILGen/availability_query.swift

@@ -29,6 +29,14 @@ if #available(iOS 7.1, *) {
 if #available(OSX 10.52, *) {
 }
 
+// CHECK: [[MAJOR:%.*]] = integer_literal $Builtin.Word, 10
+// CHECK: [[MINOR:%.*]] = integer_literal $Builtin.Word, 52
+// CHECK: [[PATCH:%.*]] = integer_literal $Builtin.Word, 0
+// CHECK: [[QUERY_FUNC:%.*]] = function_ref @_TFs26_stdlib_isOSVersionAtLeastFTBwBwBw_Bi1_ : $@convention(thin) (Builtin.Word, Builtin.Word, Builtin.Word) -> Builtin.Int1
+// CHECK: [[QUERY_RESULT:%.*]] = apply [[QUERY_FUNC]]([[MAJOR]], [[MINOR]], [[PATCH]]) : $@convention(thin) (Builtin.Word, Builtin.Word, Builtin.Word) -> Builtin.Int1
+if #available(macOS 10.52, *) {
+}
+
 // CHECK: [[MAJOR:%.*]] = integer_literal $Builtin.Word, 10
 // CHECK: [[MINOR:%.*]] = integer_literal $Builtin.Word, 0
 // CHECK: [[PATCH:%.*]] = integer_literal $Builtin.Word, 0

test/Sema/availability.swift

@@ -86,7 +86,7 @@ let unavailableOnOSX: Int = 0 // expected-note{{explicitly marked unavailable he
 let unavailableOniOS: Int = 0
 @available(iOS, unavailable) @available(OSX, unavailable)
 let unavailableOnBothA: Int = 0 // expected-note{{explicitly marked unavailable here}}
-@available(OSX, unavailable)
+@available(OSX, unavailable) @available(iOS, unavailable)
 let unavailableOnBothB: Int = 0 // expected-note{{explicitly marked unavailable here}}
 
 @available(OSX, unavailable)
@@ -98,14 +98,35 @@ typealias UnavailableOnBothA = Int // expected-note{{explicitly marked unavailab
 @available(OSX, unavailable) @available(iOS, unavailable)
 typealias UnavailableOnBothB = Int // expected-note{{explicitly marked unavailable here}}
 
+@available(macOS, unavailable)
+let unavailableOnMacOS: Int = 0 // expected-note{{explicitly marked unavailable here}}
+@available(macOS, unavailable)
+typealias UnavailableOnMacOS = Int // expected-note{{explicitly marked unavailable here}}
+
+@available(OSXApplicationExtension, unavailable)
+let unavailableOnOSXAppExt: Int = 0
+@available(macOSApplicationExtension, unavailable)
+let unavailableOnMacOSAppExt: Int = 0
+
+@available(OSXApplicationExtension, unavailable)
+typealias UnavailableOnOSXAppExt = Int
+@available(macOSApplicationExtension, unavailable)
+typealias UnavailableOnMacOSAppExt = Int
+
 func testPlatforms() {
   _ = unavailableOnOSX // expected-error{{unavailable}}
   _ = unavailableOniOS
   _ = unavailableOnBothA // expected-error{{unavailable}}
   _ = unavailableOnBothB // expected-error{{unavailable}}
+  _ = unavailableOnMacOS // expected-error{{unavailable}}
+  _ = unavailableOnOSXAppExt
+  _ = unavailableOnMacOSAppExt
 
   let _: UnavailableOnOSX = 0 // expected-error{{unavailable}}
   let _: UnavailableOniOS = 0
   let _: UnavailableOnBothA = 0 // expected-error{{unavailable}}
   let _: UnavailableOnBothB = 0 // expected-error{{unavailable}}
+  let _: UnavailableOnMacOS = 0 // expected-error{{unavailable}}
+  let _: UnavailableOnOSXAppExt = 0
+  let _: UnavailableOnMacOSAppExt = 0
 }