---

yaml
---
r: 340667
b: refs/heads/rxwei-patch-1
c: 3391b74
h: refs/heads/master
i:
  340665: c1f9dbd
  340663: f6398cd

Author: George

[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: 047749a745906f634e081e8b98a8a134a7c833b4
+refs/heads/rxwei-patch-1: 3391b746d9fb36d7bbf428bdc3f5f69e2bb9ac6f
 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/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

@@ -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.
@@ -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/scripts/compare_perf_tests.py

@@ -547,6 +547,15 @@ def __init__(self, comparator, changes_only,
         self.changes_only = changes_only
         self.single_table = single_table
 
+    MARKDOWN_DETAIL = """
+<details {3}>
+  <summary>{0} ({1})</summary>
+  {2}
+</details>
+"""
+    GIT_DETAIL = """
+{0} ({1}): {2}"""
+
     PERFORMANCE_TEST_RESULT_HEADER = ('TEST', 'MIN', 'MAX', 'MEAN', 'MAX_RSS')
     RESULT_COMPARISON_HEADER = ('TEST', 'OLD', 'NEW', 'DELTA', 'RATIO')
 
@@ -580,26 +589,16 @@ def values(result):
     def markdown(self):
         """Report results of benchmark comparisons in Markdown format."""
         return self._formatted_text(
-            label_formatter=lambda s: ('**' + s + '**'),
-            COLUMN_SEPARATOR=' | ',
-            DELIMITER_ROW=([':---'] + ['---:'] * 4),
-            SEPARATOR='&nbsp; | | | | \n',
-            SECTION="""
-<details {3}>
-  <summary>{0} ({1})</summary>
-  {2}
-</details>
-""")
+            ROW='{0} | {1} | {2} | {3} | {4} \n',
+            HEADER_SEPARATOR='---',
+            DETAIL=self.MARKDOWN_DETAIL)
 
     def git(self):
         """Report results of benchmark comparisons in 'git' format."""
         return self._formatted_text(
-            label_formatter=lambda s: s.upper(),
-            COLUMN_SEPARATOR='   ',
-            DELIMITER_ROW=None,
-            SEPARATOR='\n',
-            SECTION="""
-{0} ({1}): \n{2}""")
+            ROW='{0}   {1}   {2}   {3}   {4} \n',
+            HEADER_SEPARATOR='   ',
+            DETAIL=self.GIT_DETAIL)
 
     def _column_widths(self):
         changed = self.comparator.decreased + self.comparator.increased
@@ -615,49 +614,53 @@ def _column_widths(self):
         ]
 
         def max_widths(maximum, widths):
-            return map(max, zip(maximum, widths))
+            return tuple(map(max, zip(maximum, widths)))
 
-        return reduce(max_widths, widths, [0] * 5)
+        return reduce(max_widths, widths, tuple([0] * 5))
 
-    def _formatted_text(self, label_formatter, COLUMN_SEPARATOR,
-                        DELIMITER_ROW, SEPARATOR, SECTION):
+    def _formatted_text(self, ROW, HEADER_SEPARATOR, DETAIL):
         widths = self._column_widths()
         self.header_printed = False
 
         def justify_columns(contents):
-            return [c.ljust(w) for w, c in zip(widths, contents)]
+            return tuple([c.ljust(w) for w, c in zip(widths, contents)])
 
         def row(contents):
-            return ('' if not contents else
-                    COLUMN_SEPARATOR.join(justify_columns(contents)) + '\n')
-
-        def header(title, column_labels):
-            labels = (column_labels if not self.single_table else
-                      map(label_formatter, (title, ) + column_labels[1:]))
-            h = (('' if not self.header_printed else SEPARATOR) +
-                 row(labels) +
-                 (row(DELIMITER_ROW) if not self.header_printed else ''))
-            if self.single_table and not self.header_printed:
-                self.header_printed = True
-            return h
-
-        def format_columns(r, is_strong):
-            return (r if not is_strong else
-                    r[:-1] + ('**' + r[-1] + '**', ))
+            return ROW.format(*justify_columns(contents))
+
+        def header(header):
+            return '\n' + row(header) + row(tuple([HEADER_SEPARATOR] * 5))
+
+        def format_columns(r, strong):
+            return (r if not strong else
+                    r[:-1] + ('**{0}**'.format(r[-1]), ))
 
         def table(title, results, is_strong=False, is_open=False):
-            if not results:
+            rows = [
+                row(format_columns(ReportFormatter.values(r), is_strong))
+                for r in results
+            ]
+            if not rows:
                 return ''
-            rows = [row(format_columns(ReportFormatter.values(r), is_strong))
-                    for r in results]
-            table = (header(title if self.single_table else '',
-                            ReportFormatter.header_for(results[0])) +
-                     ''.join(rows))
-            return (table if self.single_table else
-                    SECTION.format(
-                        title, len(results), table, 'open' if is_open else ''))
-
-        return '\n' + ''.join([
+
+            if self.single_table:
+                t = ''
+                if not self.header_printed:
+                    t += header(ReportFormatter.header_for(results[0]))
+                    self.header_printed = True
+                t += row(('**' + title + '**', '', '', '', ''))
+                t += ''.join(rows)
+                return t
+
+            return DETAIL.format(
+                *[
+                    title, len(results),
+                    (header(ReportFormatter.header_for(results[0])) +
+                     ''.join(rows)),
+                    ('open' if is_open else '')
+                ])
+
+        return ''.join([
             table('Regression', self.comparator.decreased, True, True),
             table('Improvement', self.comparator.increased, True),
             ('' if self.changes_only else

branches/rxwei-patch-1/benchmark/scripts/run_smoke_bench

@@ -88,7 +88,7 @@ def main():
         help='In addition to stdout, write the results into a markdown file')
     argparser.add_argument(
         '-threshold', type=float,
-        help='The performance threshold in %% which triggers a re-run',
+        help='The performance threshold in % which triggers a re-run',
         default=5)
     argparser.add_argument(
         '-num-samples', type=int,