---

yaml
---
r: 340342
b: refs/heads/rxwei-patch-1
c: 7beb358
h: refs/heads/master

Author: xwu

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: fe32ba1a8657da03ed0b8c1e777bd5cf29f58726
+refs/heads/rxwei-patch-1: 7beb3585d5edfc24e945afca513c24205e7a47a5
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/CMakeLists.txt

@@ -223,6 +223,17 @@ option(SWIFT_STDLIB_ENABLE_SIB_TARGETS
        "Should we generate sib targets for the stdlib or not?"
        FALSE)
 
+
+set(SWIFT_DARWIN_SUPPORTED_ARCHS "" CACHE STRING
+  "Semicolon-separated list of architectures to configure on Darwin platforms. \
+If left empty all default architectures are configured.")
+
+set(SWIFT_DARWIN_MODULE_ARCHS "" CACHE STRING
+  "Semicolon-separated list of architectures to configure Swift module-only \
+targets on Darwin platforms. These targets are in addition to the full \
+library targets.")
+
+
 #
 # User-configurable Android specific options.
 #

branches/rxwei-patch-1/cmake/modules/AddSwift.cmake

@@ -303,6 +303,11 @@ function(_add_variant_c_compile_flags)
                        "-fcoverage-mapping")
   endif()
 
+  if((CFLAGS_ARCH STREQUAL "armv7" OR CFLAGS_ARCH STREQUAL "aarch64") AND
+     (CFLAGS_SDK STREQUAL "LINUX" OR CFLAGS_SDK STREQUAL "ANDROID"))
+     list(APPEND result -funwind-tables)
+  endif()
+
   if("${CFLAGS_SDK}" STREQUAL "ANDROID")
     swift_android_libcxx_include_paths(CFLAGS_CXX_INCLUDES)
     swift_android_include_for_arch("${CFLAGS_ARCH}" "${CFLAGS_ARCH}_INCLUDE")
@@ -927,6 +932,17 @@ function(_add_swift_library_single target name)
     endif()
   endif()
 
+  # Only build the modules for any arch listed in the *_MODULE_ARCHITECTURES.
+  if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_APPLE_PLATFORMS
+      AND SWIFTLIB_SINGLE_ARCHITECTURE IN_LIST SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_MODULE_ARCHITECTURES)
+    # Create dummy target to hook up the module target dependency.
+    add_custom_target("${target}"
+      DEPENDS
+        "${swift_module_dependency_target}")
+
+    return()
+  endif()
+
   set(SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS)
   foreach(object_library ${SWIFTLIB_SINGLE_INCORPORATE_OBJECT_LIBRARIES})
     list(APPEND SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS
@@ -1846,8 +1862,13 @@ function(add_swift_target_library name)
       list(APPEND swiftlib_link_flags_all "-Wl,-z,defs")
     endif()
 
+    set(sdk_supported_archs
+      ${SWIFT_SDK_${sdk}_ARCHITECTURES}
+      ${SWIFT_SDK_${sdk}_MODULE_ARCHITECTURES})
+    list(REMOVE_DUPLICATES sdk_supported_archs)
+
     # For each architecture supported by this SDK
-    foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
+    foreach(arch ${sdk_supported_archs})
       # Configure variables for this subdirectory.
       set(VARIANT_SUFFIX "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
       set(VARIANT_NAME "${name}${VARIANT_SUFFIX}")
@@ -1969,11 +1990,38 @@ function(add_swift_target_library name)
           endforeach()
         endif()
 
-        # Note this thin library.
-        list(APPEND THIN_INPUT_TARGETS ${VARIANT_NAME})
+        if(arch IN_LIST SWIFT_SDK_${sdk}_ARCHITECTURES)
+          # Note this thin library.
+          list(APPEND THIN_INPUT_TARGETS ${VARIANT_NAME})
+        endif()
       endif()
     endforeach()
 
+    # Configure module-only targets
+    if(NOT SWIFT_SDK_${sdk}_ARCHITECTURES
+        AND SWIFT_SDK_${sdk}_MODULE_ARCHITECTURES)
+      set(_target "${name}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
+
+      # Create unified sdk target
+      add_custom_target("${_target}")
+
+      foreach(_arch ${SWIFT_SDK_${sdk}_MODULE_ARCHITECTURES})
+        set(_variant_suffix "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${_arch}")
+        set(_module_variant_name "${name}-swiftmodule-${_variant_suffix}")
+
+        add_dependencies("${_target}" ${_module_variant_name})
+
+        # Add Swift standard library targets as dependencies to the top-level
+        # convenience target.
+        if(TARGET "swift-stdlib${_variant_suffix}")
+          add_dependencies("swift-stdlib${_variant_suffix}"
+            "${_target}")
+        endif()
+      endforeach()
+
+      return()
+    endif()
+
     if(NOT SWIFTLIB_OBJECT_LIBRARY)
       # Determine the name of the universal library.
       if(SWIFTLIB_SHARED)
@@ -2064,12 +2112,35 @@ function(add_swift_target_library name)
         endforeach()
       endif()
 
-      swift_is_installing_component("${SWIFTLIB_INSTALL_IN_COMPONENT}" is_installing)
-      if(NOT is_installing)
-        set_property(GLOBAL APPEND PROPERTY SWIFT_BUILDTREE_EXPORTS ${VARIANT_NAME})
-      else()
-        set_property(GLOBAL APPEND PROPERTY SWIFT_EXPORTS ${VARIANT_NAME})
-      endif()
+      swift_is_installing_component(
+        "${SWIFTLIB_INSTALL_IN_COMPONENT}"
+        is_installing)
+
+      # Add the arch-specific library targets to the global exports.
+      foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
+        set(_variant_name "${name}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
+        if(NOT TARGET "${_variant_name}")
+          continue()
+        endif()
+
+        if(is_installing)
+          set_property(GLOBAL APPEND
+            PROPERTY SWIFT_EXPORTS ${_variant_name})
+        else()
+          set_property(GLOBAL APPEND
+            PROPERTY SWIFT_BUILDTREE_EXPORTS ${_variant_name})
+        endif()
+      endforeach()
+
+      # Add the swiftmodule-only targets to the lipo target depdencies.
+      foreach(arch ${SWIFT_SDK_${sdk}_MODULE_ARCHITECTURES})
+        set(_variant_name "${name}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
+        if(NOT TARGET "${_variant_name}")
+          continue()
+        endif()
+
+        add_dependencies("${lipo_target}" "${_variant_name}")
+      endforeach()
 
       # If we built static variants of the library, create a lipo target for
       # them.

branches/rxwei-patch-1/cmake/modules/StandaloneOverlay.cmake

@@ -65,6 +65,16 @@ option(SWIFT_ENABLE_PARSEABLE_MODULE_INTERFACES
 set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
   "Build type for the Swift standard library and SDK overlays.")
 
+set(SWIFT_DARWIN_SUPPORTED_ARCHS "" CACHE STRING
+  "Semicolon-separated list of architectures to configure on Darwin platforms. \
+If left empty all default architectures are configured.")
+
+set(SWIFT_DARWIN_MODULE_ARCHS "" CACHE STRING
+  "Semicolon-separated list of architectures to configure Swift module-only \
+targets on Darwin platforms. These targets are in addition to the full \
+library targets.")
+
+
 # -----------------------------------------------------------------------------
 # Constants
 

branches/rxwei-patch-1/cmake/modules/SwiftConfigureSDK.cmake

@@ -51,6 +51,9 @@ function(_report_sdk prefix)
     message(STATUS "  Triple name: ${SWIFT_SDK_${prefix}_TRIPLE_NAME}")
   endif()
   message(STATUS "  Architectures: ${SWIFT_SDK_${prefix}_ARCHITECTURES}")
+  if(SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES)
+    message(STATUS "  Module Architectures: ${SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES}")
+  endif()
   if(NOT prefix IN_LIST SWIFT_APPLE_PLATFORMS)
     if(SWIFT_BUILD_STDLIB)
       foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
@@ -141,9 +144,30 @@ macro(configure_sdk_darwin
   set(SWIFT_SDK_${prefix}_LIB_SUBDIR "${xcrun_name}")
   set(SWIFT_SDK_${prefix}_VERSION_MIN_NAME "${version_min_name}")
   set(SWIFT_SDK_${prefix}_TRIPLE_NAME "${triple_name}")
-  set(SWIFT_SDK_${prefix}_ARCHITECTURES "${architectures}")
   set(SWIFT_SDK_${prefix}_OBJECT_FORMAT "MACHO")
 
+  set(SWIFT_SDK_${prefix}_ARCHITECTURES ${architectures})
+  if(SWIFT_DARWIN_SUPPORTED_ARCHS)
+    list_intersect(
+      "${architectures}"                  # lhs
+      "${SWIFT_DARWIN_SUPPORTED_ARCHS}"   # rhs
+      SWIFT_SDK_${prefix}_ARCHITECTURES)  # result
+  endif()
+
+  list_intersect(
+    "${SWIFT_DARWIN_MODULE_ARCHS}"            # lhs
+    "${architectures}"                        # rhs
+    SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES) # result
+
+  # Ensure the architectures and module-only architectures lists are mutually
+  # exclusive.
+  list_subtract(
+    "${SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES}" # lhs
+    "${SWIFT_SDK_${prefix}_ARCHITECTURES}"        # rhs
+    SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES)     # result
+
+  # Configure variables for _all_ architectures even if we aren't "building"
+  # them because they aren't supported.
   foreach(arch ${architectures})
     # On Darwin, all archs share the same SDK path.
     set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "${SWIFT_SDK_${prefix}_PATH}")

branches/rxwei-patch-1/include/swift/AST/Decl.h

@@ -553,7 +553,7 @@ class alignas(1 << DeclAlignInBits) Decl {
     NumRequirementsInSignature : 16
   );
 
-  SWIFT_INLINE_BITFIELD(ClassDecl, NominalTypeDecl, 1+2+1+2+1+6+1+1+1,
+  SWIFT_INLINE_BITFIELD(ClassDecl, NominalTypeDecl, 1+2+1+2+1+6+1+1+1+1,
     /// Whether this class requires all of its instance variables to
     /// have in-class initializers.
     RequiresStoredPropertyInits : 1,
@@ -581,7 +581,11 @@ class alignas(1 << DeclAlignInBits) Decl {
     AncestryComputed : 1,
 
     HasMissingDesignatedInitializers : 1,
-    HasMissingVTableEntries : 1
+    HasMissingVTableEntries : 1,
+
+    /// Whether instances of this class are incompatible
+    /// with weak and unowned references.
+    IsIncompatibleWithWeakReferences : 1
   );
 
   SWIFT_INLINE_BITFIELD(StructDecl, NominalTypeDecl, 1,
@@ -3860,6 +3864,17 @@ class ClassDecl final : public NominalTypeDecl {
     Bits.ClassDecl.HasMissingVTableEntries = newValue;
   }
 
+  /// Returns true if this class cannot be used with weak or unowned
+  /// references.
+  /// 
+  /// Note that this is true if this class or any of its ancestor classes
+  /// are marked incompatible.
+  bool isIncompatibleWithWeakReferences() const;
+
+  void setIsIncompatibleWithWeakReferences(bool newValue = true) {
+    Bits.ClassDecl.IsIncompatibleWithWeakReferences = newValue;
+  }
+
   /// Find a method of a class that overrides a given method.
   /// Return nullptr, if no such method exists.
   AbstractFunctionDecl *findOverridingDecl(

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSema.def

@@ -2538,6 +2538,12 @@ NOTE(decodable_suggest_overriding_init_here,none,
 NOTE(codable_suggest_overriding_init_here,none,
      "did you mean to override 'init(from:)' and 'encode(to:)'?", ())
 
+NOTE(missing_member_type_conformance_prevents_synthesis, none,
+     "%select{associated value|stored property}0 type %1 does not conform to "
+     "protocol %2, preventing synthesized conformance "
+     "of %3 to %2",
+     (unsigned, Type, Type, Type))
+
 // Dynamic Self
 ERROR(dynamic_self_non_method,none,
       "%select{global|local}0 function cannot return 'Self'", (bool))
@@ -3150,7 +3156,7 @@ ERROR(jump_out_of_defer,none,
       (StringRef))
 
 WARNING(defer_stmt_at_block_end,none,
-     "'defer' statement before end of scope always executes immediately; "
+     "'defer' statement at end of scope always executes immediately; "
      "replace with 'do' statement to silence this warning", ())
 
 ERROR(return_invalid_outside_func,none,
@@ -3565,6 +3571,9 @@ ERROR(invalid_ownership_protocol_type,none,
       "%0 must not be applied to non-class-bound %1; "
       "consider adding a protocol conformance that has a class bound",
       (ReferenceOwnership, Type))
+ERROR(invalid_ownership_incompatible_class,none,
+      "%0 is incompatible with %1 references",
+      (Type, ReferenceOwnership))
 ERROR(invalid_ownership_with_optional,none,
       "%0 variable cannot have optional type", (ReferenceOwnership))
 ERROR(invalid_ownership_not_optional,none,

branches/rxwei-patch-1/include/swift/AST/Expr.h

@@ -1135,6 +1135,7 @@ class ObjectLiteralExpr final
   Expr *Arg;
   Expr *SemanticExpr;
   SourceLoc PoundLoc;
+  ConcreteDeclRef Initializer;
 
   ObjectLiteralExpr(SourceLoc PoundLoc, LiteralKind LitKind,
                     Expr *Arg,
@@ -1195,6 +1196,15 @@ class ObjectLiteralExpr final
 
   StringRef getLiteralKindPlainName() const;
 
+  /// Retrieve the initializer that will be used to construct the 'object'
+  /// literal from the result of the initializer.
+  ConcreteDeclRef getInitializer() const { return Initializer; }
+
+  /// Set the initializer that will be used to construct the 'object' literal.
+  void setInitializer(ConcreteDeclRef initializer) {
+    Initializer = initializer;
+  }
+
   static bool classof(const Expr *E) {
     return E->getKind() == ExprKind::ObjectLiteral;
   }

branches/rxwei-patch-1/include/swift/AST/KnownIdentifiers.def

@@ -31,6 +31,7 @@ IDENTIFIER(Any)
 IDENTIFIER(ArrayLiteralElement)
 IDENTIFIER(atIndexedSubscript)
 IDENTIFIER_(bridgeToObjectiveC)
+IDENTIFIER(Change)
 IDENTIFIER_WITH_NAME(code_, "_code")
 IDENTIFIER(CodingKeys)
 IDENTIFIER(combine)

branches/rxwei-patch-1/include/swift/AST/KnownStdlibTypes.def

@@ -54,6 +54,7 @@ KNOWN_STDLIB_TYPE_DECL(Array, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(Set, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(Sequence, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(Dictionary, NominalTypeDecl, 2)
+KNOWN_STDLIB_TYPE_DECL(CollectionDifference, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(AnyHashable, NominalTypeDecl, 0)
 KNOWN_STDLIB_TYPE_DECL(MutableCollection, ProtocolDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(Hasher, NominalTypeDecl, 0)

branches/rxwei-patch-1/include/swift/AST/ParameterList.h

@@ -97,7 +97,8 @@ class alignas(ParamDecl *) ParameterList final :
 
   const ParamDecl *operator[](unsigned i) const { return get(i); }
   ParamDecl *&operator[](unsigned i) { return get(i); }
-  
+  bool hasInternalParameter(StringRef prefix) const;
+
   /// Change the DeclContext of any contained parameters to the specified
   /// DeclContext.
   void setDeclContextOfParamDecls(DeclContext *DC);

branches/rxwei-patch-1/include/swift/SIL/SILBuilder.h

@@ -1279,6 +1279,13 @@ class SILBuilder {
     return createUncheckedEnumData(Loc, Operand, Element, EltType);
   }
 
+  /// Return unchecked_enum_data %Operand, #Optional<T>.some.
+  SILValue emitExtractOptionalPayloadOperation(SILLocation Loc,
+                                               SILValue Operand) {
+    auto *Decl = F->getASTContext().getOptionalSomeDecl();
+    return createUncheckedEnumData(Loc, Operand, Decl);
+  }
+
   UncheckedTakeEnumDataAddrInst *
   createUncheckedTakeEnumDataAddr(SILLocation Loc, SILValue Operand,
                                   EnumElementDecl *Element, SILType Ty) {