---

yaml
---
r: 340671
b: refs/heads/rxwei-patch-1
c: 0c555ed
h: refs/heads/master
i:
  340669: 25bde6d
  340667: c8f248c
  340663: f6398cd
  340655: f838d5d
  340639: ff10281
  340607: 4d08e6a

Author: jckarter

[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: a516de58bda9f390b1d4ccc73afe1380b4fa3438
+refs/heads/rxwei-patch-1: 0c555edf767765117ea1a604b0a9f278a9f24a55
 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,17 +223,6 @@ 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.
 #
@@ -845,18 +834,14 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" AND NOT CMAKE_CROSSCOMPILING)
   set(CMAKE_OSX_DEPLOYMENT_TARGET "")
 endif()
 
-if(SWIFT_INCLUDE_TOOLS)
-  message(STATUS "Building host Swift tools for ${SWIFT_HOST_VARIANT_SDK} ${SWIFT_HOST_VARIANT_ARCH}")
-  message(STATUS "  Build type:     ${CMAKE_BUILD_TYPE}")
-  message(STATUS "  Assertions:     ${LLVM_ENABLE_ASSERTIONS}")
-  message(STATUS "  LTO:            ${SWIFT_TOOLS_ENABLE_LTO}")
-  message(STATUS "")
-else()
-  message(STATUS "Not building host Swift tools")
-  message(STATUS "")
-endif()
+message(STATUS "Building host Swift tools for ${SWIFT_HOST_VARIANT_SDK} ${SWIFT_HOST_VARIANT_ARCH}")
+message(STATUS "  Build type:     ${CMAKE_BUILD_TYPE}")
+message(STATUS "  Assertions:     ${LLVM_ENABLE_ASSERTIONS}")
+message(STATUS "  LTO:            ${SWIFT_TOOLS_ENABLE_LTO}")
+message(STATUS "")
+
+if (SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
 
-if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "Building Swift standard library and overlays for SDKs: ${SWIFT_SDKS}")
   message(STATUS "  Build type:       ${SWIFT_STDLIB_BUILD_TYPE}")
   message(STATUS "  Assertions:       ${SWIFT_STDLIB_ASSERTIONS}")
@@ -865,9 +850,12 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "Building Swift runtime with:")
   message(STATUS "  Leak Detection Checker Entrypoints: ${SWIFT_RUNTIME_ENABLE_LEAK_CHECKER}")
   message(STATUS "")
+
 else()
+
   message(STATUS "Not building Swift standard library, SDK overlays, and runtime")
   message(STATUS "")
+
 endif()
 
 #

branches/rxwei-patch-1/README.md

@@ -76,7 +76,7 @@ Please make sure you use Python 2.x. Python 3.x is not supported currently.
 
 #### macOS
 
-To build for macOS, you need [Xcode 11 beta](https://developer.apple.com/xcode/downloads/).
+To build for macOS, you need [Xcode 10.2 beta](https://developer.apple.com/xcode/downloads/).
 The required version of Xcode changes frequently, and is often a beta release.
 Check this document or the host information on <https://ci.swift.org> for the
 current required version.
@@ -98,7 +98,7 @@ Instructions for installing CMake and Ninja directly can be found [below](#build
 
 For Ubuntu, you'll need the following development dependencies:
 
-    sudo apt-get install git cmake ninja-build clang python uuid-dev libicu-dev icu-devtools libedit-dev libxml2-dev libsqlite3-dev swig libpython-dev libncurses5-dev pkg-config libcurl4-openssl-dev systemtap-sdt-dev tzdata rsync
+    sudo apt-get install git cmake ninja-build clang python uuid-dev libicu-dev icu-devtools libbsd-dev libedit-dev libxml2-dev libsqlite3-dev swig libpython-dev libncurses5-dev pkg-config libblocksruntime-dev libcurl4-openssl-dev systemtap-sdt-dev tzdata rsync
 
 **Note:** LLDB currently requires at least `swig-1.3.40` but will successfully build
 with version 2 shipped with Ubuntu.

branches/rxwei-patch-1/apinotes/Accelerate.apinotes

@@ -0,0 +1,61 @@
+Name: Accelerate
+Enumerators:
+- Name: BNNSDataTypeFloatBit
+  Availability: nonswift
+- Name: BNNSDataTypeIntBit
+  Availability: nonswift
+- Name: BNNSDataTypeUIntBit
+  Availability: nonswift
+- Name: BNNSDataTypeIndexedBit
+  Availability: nonswift
+- Name: BNNSDataTypeFloat16
+  SwiftPrivate: true
+- Name: BNNSDataTypeFloat32
+  SwiftPrivate: true
+- Name: BNNSDataTypeInt8
+  SwiftPrivate: true
+- Name: BNNSDataTypeInt16
+  SwiftPrivate: true
+- Name: BNNSDataTypeInt32
+  SwiftPrivate: true
+- Name: BNNSDataTypeUInt8
+  SwiftPrivate: true
+- Name: BNNSDataTypeUInt16
+  SwiftPrivate: true
+- Name: BNNSDataTypeUInt32
+  SwiftPrivate: true
+- Name: BNNSDataTypeIndexed8
+  SwiftPrivate: true
+
+- Name: BNNSPoolingFunctionMax
+  SwiftPrivate: true
+- Name: BNNSPoolingFunctionAverage
+  SwiftPrivate: true
+
+- Name: BNNSActivationFunctionIdentity
+  SwiftPrivate: true
+- Name: BNNSActivationFunctionRectifiedLinear
+  SwiftPrivate: true
+- Name: BNNSActivationFunctionLeakyRectifiedLinear
+  SwiftPrivate: true
+- Name: BNNSActivationFunctionSigmoid
+  SwiftPrivate: true
+- Name: BNNSActivationFunctionTanh
+  SwiftPrivate: true
+- Name: BNNSActivationFunctionScaledTanh
+  SwiftPrivate: true
+- Name: BNNSActivationFunctionAbs
+  SwiftPrivate: true
+- Name: BNNSActivationFunctionLinear
+  SwiftPrivate: true
+- Name: BNNSActivationFunctionClamp
+  SwiftPrivate: true
+- Name: BNNSActivationFunctionIntegerLinearSaturate
+  SwiftPrivate: true
+- Name: BNNSActivationFunctionIntegerLinearSaturatePerChannel
+  SwiftPrivate: true
+- Name: BNNSActivationFunctionSoftmax
+  SwiftPrivate: true
+
+- Name: BNNSFlagsUseClientPtr
+  SwiftPrivate: true

branches/rxwei-patch-1/apinotes/CMakeLists.txt

@@ -1,5 +1,7 @@
 set(sources
+  Accelerate.apinotes
   Dispatch.apinotes
+  ScriptingBridge.apinotes
   os.apinotes
 )
 

branches/rxwei-patch-1/apinotes/ScriptingBridge.apinotes

@@ -0,0 +1,5 @@
+---
+Name: ScriptingBridge
+Classes:
+- Name: SBElementArray
+  SwiftImportAsNonGeneric: true

branches/rxwei-patch-1/benchmark/single-source/RandomValues.swift

@@ -63,7 +63,7 @@ public func run_RandomIntegersLCG(_ N: Int) {
     for _ in 0 ..< 100_000 {
       x &+= Int64.random(in: 0...10_000, using: &generator)
     }
-    blackHole(x)
+    CheckResults(x == 498214315)
   }
 }
 

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

@@ -303,11 +303,6 @@ 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")
@@ -517,12 +512,8 @@ function(_add_variant_link_flags)
         NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WINDOWS"))
       list(APPEND result "-fuse-ld=lld")
     elseif(SWIFT_ENABLE_GOLD_LINKER AND
-        "${SWIFT_SDK_${LFLAGS_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
-      if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
-        list(APPEND result "-fuse-ld=gold.exe")
-      else()
-        list(APPEND result "-fuse-ld=gold")
-      endif()
+       "${SWIFT_SDK_${LFLAGS_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
+      list(APPEND result "-fuse-ld=gold")
     endif()
   endif()
 
@@ -936,17 +927,6 @@ 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
@@ -1866,13 +1846,8 @@ 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 ${sdk_supported_archs})
+    foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
       # Configure variables for this subdirectory.
       set(VARIANT_SUFFIX "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
       set(VARIANT_NAME "${name}${VARIANT_SUFFIX}")
@@ -1994,38 +1969,11 @@ function(add_swift_target_library name)
           endforeach()
         endif()
 
-        if(arch IN_LIST SWIFT_SDK_${sdk}_ARCHITECTURES)
-          # Note this thin library.
-          list(APPEND THIN_INPUT_TARGETS ${VARIANT_NAME})
-        endif()
+        # Note this thin library.
+        list(APPEND THIN_INPUT_TARGETS ${VARIANT_NAME})
       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)
@@ -2116,35 +2064,12 @@ function(add_swift_target_library name)
         endforeach()
       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()
+      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()
 
       # If we built static variants of the library, create a lipo target for
       # them.

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

@@ -65,16 +65,6 @@ 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

@@ -28,7 +28,7 @@ function(_report_sdk prefix)
       message(STATUS "  ${arch} LIB: ${${arch}_LIB}")
     endforeach()
   elseif("${prefix}" STREQUAL "ANDROID")
-    message(STATUS " NDK: $ENV{SWIFT_ANDROID_NDK_PATH}")
+    message(STATUS " NDK Dir: $ENV{SWIFT_ANDROID_NDK_PATH}")
     foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
       swift_android_include_for_arch(${arch} ${arch}_INCLUDE)
       swift_android_lib_for_arch(${arch} ${arch}_LIB)
@@ -51,9 +51,6 @@ 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})
@@ -144,30 +141,9 @@ 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}")
@@ -225,14 +201,10 @@ macro(configure_sdk_unix name architectures)
       endif()
 
       # Get the prebuilt suffix to create the correct toolchain path when using the NDK
-      if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin)
-        set(_swift_android_prebuilt_build darwin-x86_64)
-      elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL Linux)
-        set(_swift_android_prebuilt_build linux-x86_64)
-      elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
-        set(_swift_android_prebuilt_build Windows-x86_64)
-      else()
-        message(SEND_ERROR "cannot cross-compile to android from ${CMAKE_HOST_SYSTEM_NAME}")
+      if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
+        set(_swift_android_prebuilt_build "darwin-x86_64")
+      elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
+        set(_swift_android_prebuilt_build "linux-x86_64")
       endif()
       if("${arch}" STREQUAL "i686")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_PREBUILT_PATH