SE-0106: "macOS" instead of "OSX" in #available, @available, and #if

Merge pull request #3395 from jrose-apple/osx-is-dead-long-live-macos

Author: jrose-apple

include/swift/AST/Stmt.h

@@ -269,13 +269,10 @@ class alignas(8) PoundAvailableInfo final :
   const VersionRange &getAvailableRange() const { return AvailableRange; }
   void setAvailableRange(const VersionRange &Range) { AvailableRange = Range; }
 
-  void getPlatformKeywordRanges(SmallVectorImpl<CharSourceRange>
-                                &PlatformRanges);
+  void getPlatformKeywordLocs(SmallVectorImpl<SourceLoc> &PlatformLocs);
 };
 
-  
 
-  
 /// This represents an entry in an "if" or "while" condition.  Pattern bindings
 /// can bind any number of names in the pattern binding decl, and may have an
 /// associated where clause.  When "if let" is involved, an arbitrary number of

include/swift/Basic/LangOptions.h

@@ -235,7 +235,10 @@ namespace swift {
 
     /// Returns true if the 'os' platform condition argument represents
     /// a supported target operating system.
-    static bool isPlatformConditionOSSupported(StringRef OSName);
+    ///
+    /// Note that this also canonicalizes the OS name if the check returns
+    /// true.
+    static bool checkPlatformConditionOS(StringRef &OSName);
 
     /// Returns true if the 'arch' platform condition argument represents
     /// a supported target architecture.

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>());
 }
 

lib/AST/Stmt.cpp

@@ -284,24 +284,14 @@ SourceLoc PoundAvailableInfo::getEndLoc() const {
 }
 
 void PoundAvailableInfo::
-getPlatformKeywordRanges(SmallVectorImpl<CharSourceRange> &PlatformRanges) {
+getPlatformKeywordLocs(SmallVectorImpl<SourceLoc> &PlatformLocs) {
   for (unsigned i = 0; i < NumQueries; i++) {
     auto *VersionSpec =
       dyn_cast<VersionConstraintAvailabilitySpec>(getQueries()[i]);
     if (!VersionSpec)
       continue;
 
-    auto Loc = VersionSpec->getPlatformLoc();
-    auto Platform = VersionSpec->getPlatform();
-    switch (Platform) {
-    case PlatformKind::none:
-      break;
-#define AVAILABILITY_PLATFORM(X, PrettyName)                          \
-  case PlatformKind::X:                                               \
-    PlatformRanges.push_back(CharSourceRange(Loc, strlen(#X)));       \
-    break;
-#include "swift/AST/PlatformKinds.def"
-    }
+    PlatformLocs.push_back(VersionSpec->getPlatformLoc());
   }
 }
 

lib/Basic/LangOptions.cpp

@@ -55,7 +55,9 @@ bool contains(const Type (&Array)[N], const Type &V) {
   return std::find(std::begin(Array), std::end(Array), V) != std::end(Array);
 }
 
-bool LangOptions::isPlatformConditionOSSupported(StringRef OSName) {
+bool LangOptions::checkPlatformConditionOS(StringRef &OSName) {
+  if (OSName == "macOS")
+    OSName = "OSX";
   return contains(SupportedConditionalCompilationOSs, OSName);
 }
 

lib/IDE/SyntaxModel.cpp

@@ -549,12 +549,13 @@ void ModelASTWalker::handleStmtCondition(StmtCondition cond) {
   for (const auto &elt : cond) {
     if (elt.getKind() != StmtConditionElement::CK_Availability) continue;
 
-    SmallVector<CharSourceRange, 5> PlatformRanges;
-    elt.getAvailability()->getPlatformKeywordRanges(PlatformRanges);
-    std::for_each(PlatformRanges.begin(), PlatformRanges.end(),
-                  [&](CharSourceRange &Range) {
-                    passNonTokenNode({SyntaxNodeKind::Keyword, Range});
-                  });
+    SmallVector<SourceLoc, 5> PlatformLocs;
+    elt.getAvailability()->getPlatformKeywordLocs(PlatformLocs);
+    std::for_each(PlatformLocs.begin(), PlatformLocs.end(),
+                  [&](SourceLoc loc) {
+      auto range = charSourceRangeFromSourceRange(SM, loc);
+      passNonTokenNode({SyntaxNodeKind::Keyword, range});
+    });
   }
 }
 

lib/Parse/ParseStmt.cpp

@@ -1711,7 +1711,7 @@ Parser::evaluateConditionalCompilationExpr(Expr *condition) {
           return ConditionalCompilationExprState::error();
         }
         if (fnName == "os") {
-          if (!LangOptions::isPlatformConditionOSSupported(argument)) {
+          if (!LangOptions::checkPlatformConditionOS(argument)) {
             diagnose(UDRE->getLoc(), diag::unknown_platform_condition_argument,
                      "operating system", fnName);
             return ConditionalCompilationExprState::error();

test/Parse/ConditionalCompilation/x64OSXTarget.swift

@@ -6,3 +6,10 @@ class C {}
 var x = C()
 #endif
 var y = x
+
+
+#if arch(x86_64) && os(macOS) && _runtime(_ObjC) && _endian(little)
+class CC {}
+var xx = CC()
+#endif
+var yy = xx

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