Merge branch 'master' into mracek/arm64e

Author: kubamracek

cmake/modules/AddSwift.cmake

@@ -895,30 +895,13 @@ function(_add_swift_host_executable_single name)
     LINK_LIBRARIES_VAR_NAME link_libraries
     LIBRARY_SEARCH_DIRECTORIES_VAR_NAME library_search_directories)
 
-  handle_swift_sources(
-      dependency_target
-      unused_module_dependency_target
-      unused_sib_dependency_target
-      unused_sibopt_dependency_target
-      unused_sibgen_dependency_target
-      SWIFTEXE_SINGLE_SOURCES SWIFTEXE_SINGLE_EXTERNAL_SOURCES ${name}
-      DEPENDS
-        ${SWIFTEXE_SINGLE_DEPENDS}
-      MODULE_NAME ${name}
-      SDK ${SWIFTEXE_SINGLE_SDK}
-      ARCHITECTURE ${SWIFTEXE_SINGLE_ARCHITECTURE}
-      COMPILE_FLAGS ${SWIFTEXE_SINGLE_COMPILE_FLAGS}
-      IS_MAIN)
-  add_swift_source_group("${SWIFTEXE_SINGLE_EXTERNAL_SOURCES}")
-
   add_executable(${name}
       ${SWIFTEXE_SINGLE_SOURCES}
       ${SWIFTEXE_SINGLE_EXTERNAL_SOURCES})
 
   add_dependencies_multiple_targets(
       TARGETS "${name}"
       DEPENDS
-        ${dependency_target}
         ${LLVM_COMMON_DEPENDS}
         ${SWIFTEXE_SINGLE_DEPENDS})
   llvm_update_compile_flags("${name}")
@@ -960,17 +943,6 @@ function(_add_swift_host_executable_single name)
 
   swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_LINK_COMPONENTS})
 
-  # NOTE(compnerd) use the C linker language to invoke `clang` rather than
-  # `clang++` as we explicitly link against the C++ runtime.  We were previously
-  # actually passing `-nostdlib++` to avoid the C++ runtime linkage.
-  if(${SWIFTEXE_SINGLE_SDK} STREQUAL ANDROID)
-    set_property(TARGET "${name}" PROPERTY
-      LINKER_LANGUAGE "C")
-  else()
-    set_property(TARGET "${name}" PROPERTY
-      LINKER_LANGUAGE "CXX")
-  endif()
-
   set_target_properties(${name} PROPERTIES FOLDER "Swift executables")
 endfunction()
 

cmake/modules/SwiftConfigureSDK.cmake

@@ -127,12 +127,9 @@ macro(configure_sdk_darwin
         COMMAND "xcrun" "--sdk" "${xcrun_name}" "--show-sdk-path"
         OUTPUT_VARIABLE SWIFT_SDK_${prefix}_PATH
         OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(NOT EXISTS "${SWIFT_SDK_${prefix}_PATH}/System/Library/Frameworks/module.map")
-      message(FATAL_ERROR "${name} SDK not found at ${SWIFT_SDK_${prefix}_PATH}.")
-    endif()
   endif()
 
-  if(NOT EXISTS "${SWIFT_SDK_${prefix}_PATH}/System/Library/Frameworks/module.map")
+  if(NOT EXISTS "${SWIFT_SDK_${prefix}_PATH}/SDKSettings.plist")
     message(FATAL_ERROR "${name} SDK not found at SWIFT_SDK_${prefix}_PATH.")
   endif()
 

docs/SIL.rst

@@ -1961,7 +1961,7 @@ alloc_stack
 ```````````
 ::
 
-  sil-instruction ::= 'alloc_stack' sil-type (',' debug-var-attr)*
+  sil-instruction ::= 'alloc_stack' '[dynamic_lifetime]'? sil-type (',' debug-var-attr)*
 
   %1 = alloc_stack $T
   // %1 has type $*T
@@ -1980,6 +1980,10 @@ predecessors, the stack height and order of allocations must be consistent
 coming from all predecessor blocks. ``alloc_stack`` allocations must be
 deallocated in last-in, first-out stack order.
 
+The ``dynamic_lifetime`` attribute specifies that the initialization and
+destruction of the stored value cannot be verified at compile time.
+This is the case, e.g. for conditionally initialized objects.
+
 The memory is not retainable. To allocate a retainable box for a value
 type, use ``alloc_box``.
 

docs/WindowsBuild.md

@@ -45,13 +45,13 @@ git clone https://github.com/compnerd/windows-swift windows-swift
 
 ## Acquire ICU, SQLite3, curl, libxml2 and zlib
 
-Go to [compnerd's windows-swift azure page](https://dev.azure.com/compnerd/windows-swift/_build) and open [Pipelines](https://dev.azure.com/compnerd/windows-swift/_build) where you'll see bots (hopefully green) for:
+Go to [compnerd's windows-swift azure page](https://dev.azure.com/compnerd/swift-build/_build) and open [Pipelines](https://dev.azure.com/compnerd/swift-build/_build) where you'll see bots (hopefully green) for:
 
-- [ICU](https://dev.azure.com/compnerd/windows-swift/_build?definitionId=9)
-- [SQLite](https://dev.azure.com/compnerd/windows-swift/_build?definitionId=12&_a=summary)
-- [curl](https://dev.azure.com/compnerd/windows-swift/_build?definitionId=11&_a=summary)
-- [libxml2](https://dev.azure.com/compnerd/windows-swift/_build?definitionId=10&_a=summary)
-- [zlib](https://dev.azure.com/compnerd/windows-swift/_build?definitionId=16&_a=summary)
+- [ICU](https://dev.azure.com/compnerd/swift-build/_build?definitionId=9)
+- [SQLite](https://dev.azure.com/compnerd/swift-build/_build?definitionId=12&_a=summary)
+- [curl](https://dev.azure.com/compnerd/swift-build/_build?definitionId=11&_a=summary)
+- [libxml2](https://dev.azure.com/compnerd/swift-build/_build?definitionId=10&_a=summary)
+- [zlib](https://dev.azure.com/compnerd/swift-build/_build?definitionId=16&_a=summary)
 
 Download each of the zip files and copy their contents into S:/Library. The directory structure should resemble:
 

include/swift/AST/ASTMangler.h

@@ -39,8 +39,8 @@ class ASTMangler : public Mangler {
   bool OptimizeProtocolNames = true;
 
   /// If enabled, use Objective-C runtime names when mangling @objc Swift
-  /// protocols.
-  bool UseObjCProtocolNames = false;
+  /// protocols and classes.
+  bool UseObjCRuntimeNames = false;
 
   /// If enabled, non-canonical types are allowed and type alias types get a
   /// special mangling.

include/swift/AST/ASTTypeIDZone.def

@@ -54,3 +54,4 @@ SWIFT_TYPEID_NAMED(TypeAliasDecl *, TypeAliasDecl)
 SWIFT_TYPEID_NAMED(ValueDecl *, ValueDecl)
 SWIFT_TYPEID_NAMED(VarDecl *, VarDecl)
 SWIFT_TYPEID(FingerprintAndMembers)
+SWIFT_TYPEID(Identifier)

include/swift/AST/ASTTypeIDs.h

@@ -62,6 +62,7 @@ struct TypeWitnessAndDecl;
 enum class AncestryFlags : uint8_t;
 enum class ImplicitMemberAction : uint8_t;
 struct FingerprintAndMembers;
+class Identifier;
 
 // Define the AST type zone (zone 1)
 #define SWIFT_TYPEID_ZONE AST

include/swift/AST/AccessScope.h

@@ -24,12 +24,16 @@ namespace swift {
 /// a particular declaration can be accessed.
 class AccessScope {
   /// The declaration context (if not public) along with a bit saying
-  /// whether this scope is private (or not).
+  /// whether this scope is private, SPI or not.
+  /// If the declaration context is set, the bit means that the scope is
+  /// private or not. If the declaration context is null, the bit means that
+  /// this scope is SPI or not.
   llvm::PointerIntPair<const DeclContext *, 1, bool> Value;
+
 public:
-  AccessScope(const DeclContext *DC, bool isPrivate = false);
+  AccessScope(const DeclContext *DC, bool isPrivate = false, bool isSPI = false);
 
-  static AccessScope getPublic() { return AccessScope(nullptr); }
+  static AccessScope getPublic(bool isSPI = false) { return AccessScope(nullptr, false, isSPI); }
 
   /// Check if private access is allowed. This is a lexical scope check in Swift
   /// 3 mode. In Swift 4 mode, declarations and extensions of the same type will
@@ -46,18 +50,24 @@ class AccessScope {
   }
 
   bool isPublic() const { return !Value.getPointer(); }
-  bool isPrivate() const { return Value.getInt(); }
+  bool isPrivate() const { return Value.getPointer() && Value.getInt(); }
   bool isFileScope() const;
   bool isInternal() const;
 
+  // Is this a public scope
+  bool isSPI() const { return !Value.getPointer() && Value.getInt(); }
+
   /// Returns true if this is a child scope of the specified other access scope.
   ///
   /// \see DeclContext::isChildContextOf
   bool isChildOf(AccessScope AS) const {
     if (!isPublic() && !AS.isPublic())
       return allowsPrivateAccess(getDeclContext(), AS.getDeclContext());
-    if (isPublic() && AS.isPublic())
+    if (isPublic() && AS.isPublic()) {
+      if (isSPI() != AS.isSPI())
+        return isSPI();
       return false;
+    }
     return AS.isPublic();
   }
 
@@ -76,6 +86,8 @@ class AccessScope {
   /// have common intersection, or None if scopes don't intersect.
   const Optional<AccessScope> intersectWith(AccessScope accessScope) const {
     if (hasEqualDeclContextWith(accessScope)) {
+      if (isSPI())
+        return *this;
       if (isPrivate())
         return *this;
       return accessScope;

include/swift/AST/Attr.def

@@ -541,8 +541,9 @@ DECL_ATTR(derivative, Derivative,
   97)
 
 DECL_ATTR(_spi, SPIAccessControl,
-  OnFunc | OnExtension | OnGenericType | OnVar | OnSubscript | OnConstructor |
-  OnImport | AllowMultipleAttributes | UserInaccessible |
+  OnAbstractFunction | OnExtension | OnGenericType | OnVar | OnSubscript |
+  OnImport | OnAccessor | OnEnumElement |
+  AllowMultipleAttributes | UserInaccessible |
   ABIStableToAdd | ABIStableToRemove | APIBreakingToAdd | APIStableToRemove,
   98)
 

include/swift/AST/Comment.h

@@ -93,15 +93,27 @@ class DocComment {
 };
 
 /// Get a parsed documentation comment for the declaration, if there is one.
+///
+/// \param AllowSerialized Allow loading serialized doc comment data, including
+/// comment ranges.
 DocComment *getSingleDocComment(swift::markup::MarkupContext &Context,
-                                const Decl *D);
+                                const Decl *D, bool AllowSerialized = false);
 
-const Decl *getDocCommentProvidingDecl(const Decl *D);
+/// Get the declaration that actually provides a doc comment for another.
+///
+/// \param AllowSerialized Allow loading serialized doc comment data, including
+/// comment ranges.
+const Decl *getDocCommentProvidingDecl(const Decl *D,
+                                       bool AllowSerialized = false);
 
 /// Attempt to get a doc comment from the declaration, or other inherited
 /// sources, like from base classes or protocols.
+///
+/// \param AllowSerialized Allow loading serialized doc comment data, including
+/// comment ranges.
 DocComment *getCascadingDocComment(swift::markup::MarkupContext &MC,
-                                   const Decl *D);
+                                   const Decl *D,
+                                   bool AllowSerialized = false);
 
 /// Extract comments parts from the given Markup node.
 swift::markup::CommentParts