---

yaml
---
r: 340414
b: refs/heads/rxwei-patch-1
c: 6bf0826
h: refs/heads/master

Author: drodriguez

[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: e65dfc8f2d489766c4d05b2490803c0bf9e857fa
+refs/heads/rxwei-patch-1: 6bf0826524b10612f9905cef150df96edcbd57cd
 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/.mailmap

@@ -29,11 +29,12 @@ Daniel Duan <[email protected]> <[email protected]>
 Dante Broggi <[email protected]>
 Dave <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
+Dave Abrahams <[email protected]> <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
 Dave Lee <[email protected]> <[email protected]>
-David Rönnqvist <[email protected]> <[email protected]>
-David Rönnqvist <[email protected]>
+David Rönnqvist <[email protected]> <[email protected]>
+David Rönnqvist <[email protected]>
 David Ungar <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
@@ -42,8 +43,10 @@ Davide Italiano <[email protected]> <[email protected]>
 Davide Italiano <[email protected]> <[email protected]>
 Dmitri Gribenko <[email protected]> <[email protected]>
 Doug Coleman <[email protected]> <[email protected]>
+Enrico Granata <[email protected]> <[email protected]>
 Enrico Granata <[email protected]> <[email protected]>
 Erik Eckstein <[email protected]>
+Erik Eckstein <[email protected]> <[email protected]>
 Erik Verbruggen <[email protected]> <[email protected]>
 Ewa Matejska <[email protected]>
 Ewa Matejska <[email protected]> <[email protected]>
@@ -127,13 +130,15 @@ Ross Bayer <[email protected]>
 Russ Bishop <[email protected]> <[email protected]>
 Ryan Lovelett <[email protected]> <[email protected]>
 Shawn Erickson <[email protected]> <[email protected]>
+Slava Pestov <[email protected]> <[email protected]>
 Slava Pestov <[email protected]> <[email protected]>
 Stephen Canon <[email protected]>
 Stephen Canon <[email protected]> <[email protected]>
 Sukolsak Sakshuwong <[email protected]>
 Todd Fiala <[email protected]> <[email protected]>
 Toni Suter <[email protected]> <[email protected]>
 Vedant Kumar <[email protected]> <[email protected]>
+Xi Ge <[email protected]> <[email protected]>
 Xin Tong <[email protected]> <[email protected]>
 Xin Tong <[email protected]> <[email protected]>
 Yuka Ezura <[email protected]> <[email protected]>

branches/rxwei-patch-1/CHANGELOG.md

@@ -26,28 +26,6 @@ CHANGELOG
 Swift Next
 ----------
 
-* [SR-8974][]:
-
-  Duplicate tuple element labels are no longer allowed, because it leads
-  to incorrect behavior. For example:
-
-  ```
-  let dupLabels: (foo: Int, foo: Int) = (foo: 1, foo: 2)
-
-  enum Foo { case bar(x: Int, x: Int) }
-  let f: Foo = .bar(x: 0, x: 1)
-  ```
-
-  will now be diagnosed as an error. 
-
-  Note: You can still use duplicate labels when declaring functions and
-  subscripts, as long as the internal labels are different. For example:
-
-  ```
-  func foo(bar x: Int, bar y: Int) {}
-  subscript(a x: Int, a y: Int) -> Int {}
-  ```
-
 * [SR-6118][]:
 
   Subscripts can now declare default arguments:
@@ -7718,6 +7696,5 @@ Swift 1.0
 [SR-7799]: <https://bugs.swift.org/browse/SR-7799>
 [SR-8109]: <https://bugs.swift.org/browse/SR-8109>
 [SR-8546]: <https://bugs.swift.org/browse/SR-8546>
-[SR-8974]: <https://bugs.swift.org/browse/SR-8974>
 [SR-9043]: <https://bugs.swift.org/browse/SR-9043>
 [SR-9827]: <https://bugs.swift.org/browse/SR-9827>

branches/rxwei-patch-1/CMakeLists.txt

@@ -117,6 +117,8 @@ endif()
 
 set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
     "Build Swift with code coverage instrumenting enabled [FALSE, NOT-MERGED, MERGED]")
+set_property(CACHE SWIFT_ANALYZE_CODE_COVERAGE PROPERTY
+    STRINGS FALSE "NOT-MERGED" "MERGED")
 
 # SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
 # can be reused when a new version of Swift comes out (assuming the user hasn't
@@ -169,20 +171,8 @@ endif()
 
 set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
     "Build type for the Swift standard library and SDK overlays [Debug, RelWithDebInfo, Release, MinSizeRel]")
-# Allow the user to specify the standard library CMAKE_MSVC_RUNTIME_LIBRARY
-# value.  The following values are valid:
-#   - MultiThreaded (/MT)
-#   - MultiThreadedDebug (/MTd)
-#   - MultiThreadedDLL (/MD)
-#   - MultiThreadedDebugDLL (/MDd)
-if(CMAKE_BUILD_TYPE STREQUAL Debug)
-  set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDebugDLL)
-else()
-  set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDLL)
-endif()
-set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY
-  ${SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default}
-  CACHE STRING "MSVC Runtime Library for the standard library")
+set_property(CACHE SWIFT_STDLIB_BUILD_TYPE PROPERTY
+    STRINGS "Debug" "RelWithDebInfo" "Release" "MinSizeRel")
 
 is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" swift_optimized)
 if(swift_optimized)
@@ -223,17 +213,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.
 #

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.
@@ -141,26 +141,26 @@ more environments.
 
 To build using Ninja, run:
 
-    swift/utils/build-script --release-debuginfo
+    utils/build-script --release-debuginfo
 
 When developing Swift, it helps to build what you're working on in a debug
 configuration while building the rest of the project with optimizations. Below
 are some examples of using debug variants:
 
-    swift/utils/build-script --release-debuginfo --debug-swift # Swift frontend built in debug
-    swift/utils/build-script --release-debuginfo --debug-swift-stdlib # Standard library built in debug
-    swift/utils/build-script --release-debuginfo --debug-swift --force-optimized-typechecker # Swift frontend sans type checker built in debug
+    utils/build-script --release-debuginfo --debug-swift # Swift frontend built in debug
+    utils/build-script --release-debuginfo --debug-swift-stdlib # Standard library built in debug
+    utils/build-script --release-debuginfo --debug-swift --force-optimized-typechecker # Swift frontend sans type checker built in debug
 
 Limiting the amount of debug code in the compiler has a very large impact on
 Swift compile times, and in turn the test execution time. If you want to build
 the entire project in debug, you can run:
 
-    swift/utils/build-script --debug
+    utils/build-script --debug
 
 For documentation of all available arguments, as well as additional usage
 information, see the inline help:
 
-    swift/utils/build-script -h
+    utils/build-script -h
 
 #### Xcode
 
@@ -223,7 +223,7 @@ script is used by swift.org's CI to produce snapshots and can allow for one to
 locally reproduce such builds for development or distribution purposes. E.x.:
 
 ```
-  $ ./swift/utils/build-toolchain $BUNDLE_PREFIX
+  $ ./utils/build-toolchain $BUNDLE_PREFIX
 ```
 
 where ``$BUNDLE_PREFIX`` is a string that will be prepended to the build 

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/CMakeLists.txt

@@ -108,7 +108,6 @@ set(SWIFT_BENCH_MODULES
     single-source/NSError
     single-source/NSStringConversion
     single-source/NibbleSort
-    single-source/NIOChannelPipeline
     single-source/NopDeinit
     single-source/ObjectAllocation
     single-source/ObjectiveCBridging