Merge pull request #1452 from swiftwasm/release/5.3

[pull] swiftwasm-release/5.3 from release/5.3

Author: pull[bot]

include/swift/AST/Attr.h

@@ -814,8 +814,8 @@ class AvailableAttr : public DeclAttribute {
   }
 
   /// Returns the string for the platform of the attribute.
-  StringRef platformString() const {
-    return swift::platformString(Platform);
+  StringRef platformString(bool PreferMacOSSpelling = false) const {
+    return swift::platformString(Platform, PreferMacOSSpelling);
   }
 
   /// Returns the human-readable string for the platform of the attribute.

include/swift/AST/PlatformKind.h

@@ -35,7 +35,9 @@ enum class PlatformKind: uint8_t {
 
 /// Returns the short string representing the platform, suitable for
 /// use in availability specifications (e.g., "OSX").
-StringRef platformString(PlatformKind platform);
+///
+/// \param useMacOSSpelling whether use the "macOS" spelling in place of "OSX".
+StringRef platformString(PlatformKind platform, bool useMacOSSpelling = false);
 
 /// Returns the platform kind corresponding to the passed-in short platform name
 /// or None if such a platform kind does not exist.

include/swift/AST/PrintOptions.h

@@ -442,6 +442,8 @@ struct PrintOptions {
   /// (e.g.  MyFramework).
   bool MapCrossImportOverlaysToDeclaringModule = false;
 
+  bool PreferMacOSSpelling = false;
+
   bool PrintAsMember = false;
 
   /// Whether to print parameter specifiers as 'let' and 'var'.
@@ -530,6 +532,7 @@ struct PrintOptions {
     result.SkipUnderscoredKeywords = true;
     result.EnumRawValues = EnumRawValueMode::PrintObjCOnly;
     result.MapCrossImportOverlaysToDeclaringModule = true;
+    result.PreferMacOSSpelling = true;
     return result;
   }
 

include/swift/Runtime/FoundationSupport.h

@@ -0,0 +1,40 @@
+//===--- FoundationSupport.cpp - Support functions for Foundation ---------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// Helper functions for the Foundation framework.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_RUNTIME_FOUNDATION_SUPPORT_H
+#define SWIFT_RUNTIME_FOUNDATION_SUPPORT_H
+
+#include "swift/Runtime/Config.h"
+
+#if SWIFT_OBJC_INTEROP
+#include <objc/runtime.h>
+
+#ifdef __cplusplus
+namespace swift { extern "C" {
+#endif
+
+/// Returns a boolean indicating whether the Objective-C name of a class type is
+/// stable across executions, i.e., if the class name is safe to serialize. (The
+/// names of private and local types are unstable.)
+SWIFT_RUNTIME_STDLIB_SPI
+bool _swift_isObjCTypeNameSerializable(Class theClass);
+
+#ifdef __cplusplus
+}} // extern "C", namespace swift
+#endif
+
+#endif // SWIFT_OBJC_INTEROP
+#endif // SWIFT_RUNTIME_FOUNDATION_SUPPORT_H

lib/AST/ASTPrinter.cpp

@@ -991,7 +991,9 @@ void PrintAST::printAttributes(const Decl *D) {
     }
 
     // SPI groups
-    if (Options.PrintSPIs) {
+    if (Options.PrintSPIs &&
+        DeclAttribute::canAttributeAppearOnDeclKind(
+          DAK_SPIAccessControl, D->getKind())) {
       interleave(D->getSPIGroups(),
              [&](Identifier spiName) {
                Printer.printAttrName("_spi", true);

lib/AST/Attr.cpp

@@ -427,7 +427,8 @@ static void printShortFormAvailable(ArrayRef<const DeclAttribute *> Attrs,
       assert(AvailAttr->Introduced.hasValue());
       if (isShortFormAvailabilityImpliedByOther(AvailAttr, Attrs))
         continue;
-      Printer << platformString(AvailAttr->Platform) << " "
+      Printer << platformString(AvailAttr->Platform,
+                                Options.PreferMacOSSpelling) << " "
               << AvailAttr->Introduced.getValue().getAsString() << ", ";
     }
     Printer << "*)";
@@ -844,8 +845,8 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options,
     Printer << "(module: ";
     auto Attr = cast<OriginallyDefinedInAttr>(this);
     Printer << "\"" << Attr->OriginalModuleName << "\", ";
-    Printer << platformString(Attr->Platform) << " " <<
-      Attr->MovedVersion.getAsString();
+    Printer << platformString(Attr->Platform, Options.PreferMacOSSpelling) <<
+      " " << Attr->MovedVersion.getAsString();
     Printer << ")";
     break;
   }
@@ -859,7 +860,7 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options,
     else if (Attr->isPackageDescriptionVersionSpecific())
       Printer << "_PackageDescription";
     else
-      Printer << Attr->platformString();
+      Printer << Attr->platformString(Options.PreferMacOSSpelling);
 
     if (Attr->isUnconditionallyUnavailable())
       Printer << ", unavailable";

lib/AST/PlatformKind.cpp

@@ -23,7 +23,18 @@
 
 using namespace swift;
 
-StringRef swift::platformString(PlatformKind platform) {
+StringRef swift::platformString(PlatformKind platform, bool useMacOSSpelling) {
+  if (useMacOSSpelling) {
+    switch (platform) {
+    case PlatformKind::OSX:
+      return "macOS";
+    case PlatformKind::OSXApplicationExtension:
+      return "macOSApplicationExtension";
+    default:
+      break;
+    }
+  }
+
   switch (platform) {
   case PlatformKind::none:
     return "*";

lib/Frontend/CompilerInvocation.cpp

@@ -76,6 +76,20 @@ void CompilerInvocation::setDefaultPrebuiltCacheIfNecessary() {
     platform = getPlatformNameForTriple(LangOpts.Target);
   }
   llvm::sys::path::append(defaultPrebuiltPath, platform, "prebuilt-modules");
+
+  // If the SDK version is given, we should check if SDK-versioned prebuilt
+  // module cache is available and use it if so.
+  if (auto ver = LangOpts.SDKVersion) {
+    // "../macosx/prebuilt-modules"
+    SmallString<64> defaultPrebuiltPathWithSDKVer = defaultPrebuiltPath;
+    // "../macosx/prebuilt-modules/10.15"
+    llvm::sys::path::append(defaultPrebuiltPathWithSDKVer, ver->getAsString());
+    // If the versioned prebuilt module cache exists in the disk, use it.
+    if (llvm::sys::fs::exists(defaultPrebuiltPathWithSDKVer)) {
+      FrontendOpts.PrebuiltModuleCachePath = defaultPrebuiltPathWithSDKVer.str();
+      return;
+    }
+  }
   FrontendOpts.PrebuiltModuleCachePath = defaultPrebuiltPath.str();
 }
 

stdlib/public/Darwin/Foundation/CMakeLists.txt

@@ -7,7 +7,7 @@ add_swift_target_library(swiftFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES
   BundleLookup.mm
   Calendar.swift
   CharacterSet.swift
-  CheckClass.mm
+  CheckClass.swift
   Codable.swift
   Collections+DataProtocol.swift
   CombineTypealiases.swift