Merge remote-tracking branch 'upstream/master' into optional-to-archetype-swift5

Author: hamishknight

CHANGELOG.md

@@ -64,6 +64,20 @@ Swift 5.0
   // prints: Optional(42)
   ```
 
+* [SE-0227][]:
+
+  Key paths now support the `\.self` keypath, which is a `WritableKeyPath`
+  that refers to its entire input value:
+
+    ```swift
+    let id = \Int.self
+
+    var x = 2
+    print(x[keyPath: id]) // prints 2
+    x[keyPath: id] = 3
+    print(x[keyPath: id]) // prints 3
+    ```
+
 * [SE-0214][]:
 
   Renamed the `DictionaryLiteral` type to `KeyValuePairs`.
@@ -112,6 +126,8 @@ Swift 5.0
 Swift 4.2
 ---------
 
+### 2018-09-17 (Xcode 10.0)
+
 * [SE-0194][]
 
   The new CaseIterable protocol describes types which have a static
@@ -317,8 +333,6 @@ Swift 4.2
   conditionally conforms to `P`, will succeed when the conditional
   requirements are met.
 
-**Add new entries to the top of this section, not here!**
-
 Swift 4.1
 ---------
 

CMakeLists.txt

@@ -860,15 +860,14 @@ function(swift_icu_variables_set sdk arch result)
   endif()
 endfunction()
 
-# ICU is provided through CoreFoundation on Darwin.  On other hosts, assume that
-# we are compiling for the build as the host.  In such a case, if the ICU
+# ICU is provided through CoreFoundation on Darwin.  On other hosts, if the ICU
 # unicode and i18n include and library paths are not defined, perform a standard
 # package lookup.  Otherwise, rely on the paths specified by the user.  These
 # need to be defined when cross-compiling.
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
-    swift_icu_variables_set("${SWIFT_HOST_VARIANT_SDK_default}"
-                            "${SWIFT_HOST_VARIANT_ARCH_default}"
+    swift_icu_variables_set("${SWIFT_PRIMARY_VARIANT_SDK}"
+                            "${SWIFT_PRIMARY_VARIANT_ARCH}"
                             ICU_CONFIGURED)
     if("${SWIFT_PATH_TO_LIBICU_BUILD}" STREQUAL "" AND NOT ${ICU_CONFIGURED})
       find_package(ICU REQUIRED COMPONENTS uc i18n)

README.md

@@ -71,7 +71,7 @@ supported host development operating systems.
 
 #### macOS
 
-To build for macOS, you need [Xcode 10 beta 6](https://developer.apple.com/xcode/downloads/).
+To build for macOS, you need [Xcode 10.0](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.

apinotes/README.md

@@ -6,75 +6,12 @@ original Objective-C headers. This semantic information can then be
 used by the Swift compiler when importing the corresponding Objective-C
 module to provide a better mapping of Objective-C APIs into Swift.
 
-API notes are organized into a set of `.apinotes` files. Each
-`.apinotes` file contains annotations for a single Objective-C module,
-written in YAML (FIXME: to be) described below. These YAML sources
-must be manually compiled into a binary representation (`.apinotesc`)
-that the Swift compiler will lazily load when it builds code, also
+API notes are organized into a set of `.apinotes` files. Each `.apinotes` file
+contains annotations for a single Objective-C module, written in YAML (FIXME:
+to be) described in the Clang repository. These YAML sources are lazily loaded
+by the Swift compiler when it imports the corresponding framework, also
 described below.
 
-# API Notes YAML Format
-
-TBD...
-
-# Compiling API notes
-
-The Swift compiler lazily loads API notes from compiled API notes
-files (`.apinotesc` files) and uses these annotations to affect the
-Swift signatures of imported Objective-C APIs. Compiled API notes
-files reside in the Swift module directory, i.e., the same directory
-where the `.swiftmodule` file would reside for the Swift overlay of
-that module. For system modules, the path depends on the platform
-and architecture.
-
-Platform  | Path
-:------------- | :-------------
-  macOS | `$SWIFT_EXEC/lib/swift/macosx/`
-  iOS (32-bit) | `$SWIFT_EXEC/lib/swift/iphoneos/32`
-  iOS (64-bit) | `$SWIFT_EXEC/lib/swift/iphoneos`
-  iOS Simulator (32-bit) | `$SWIFT_EXEC/lib/swift/iphonesimulator/32`
-  iOS Simulator (64-bit) | `$SWIFT_EXEC/lib/swift/iphonesimulator`
-
-where `$SWIFT_EXEC/bin/swift` is the path to the Swift compiler
-executable.
-
-When updating API notes for a system module, recompile the API notes
-and place the result in the appropriate directories listed above. The
-Swift compiler itself need not be recompiled except in rare cases
-where the changes affect how the SDK overlays are built. To recompile
-API notes for a given module `$MODULE` and place them into their
-
-### macOS
-```
-xcrun swift -apinotes -yaml-to-binary -target x86_64-apple-macosx10.10 -o $SWIFT_EXEC/lib/swift/macosx/$MODULE.apinotesc $MODULE.apinotes
-```
-
-### iOS (32-bit)
-```
-xcrun swift -apinotes -yaml-to-binary -target armv7-apple-ios7.0 -o $SWIFT_EXEC/lib/swift/iphoneos/32/$MODULE.apinotesc $MODULE.apinotes
-```
-
-### iOS (64-bit)
-```
-xcrun swift -apinotes -yaml-to-binary -target arm64-apple-ios7.0 -o $SWIFT_EXEC/lib/swift/iphoneos/$MODULE.apinotesc $MODULE.apinotes
-```
-
-### iOS Simulator (32-bit)
-```
-xcrun swift -apinotes -yaml-to-binary -target i386-apple-ios7.0 -o $SWIFT_EXEC/lib/swift/iphonesimulator/32/$MODULE.apinotesc $MODULE.apinotes
-```
-
-### iOS Simulator (64-bit)
-```
-xcrun swift -apinotes -yaml-to-binary -target x86_64-apple-ios7.0 -o $SWIFT_EXEC/lib/swift/iphonesimulator/$MODULE.apinotesc $MODULE.apinotes
-```
-
 To add API notes for a system module `$MODULE` that does not have them yet,
 create a new source file `$MODULE.apinotes` and update CMakeLists.txt.
 Updated API notes will be found by the build system during the next build.
-
-Note that Swift provides decompilation of binary API notes files via
-the `-apinotes -binary-to-yaml` option, which allows one to inspect
-the information the compiler is using internally. The order of the
-entities in the original YAML input is not preserved, so all entities
-in the resulting YAML output are sorted alphabetically.

benchmark/CMakeLists.txt

@@ -56,6 +56,7 @@ set(SWIFT_BENCH_MODULES
     single-source/Chars
     single-source/ClassArrayGetter
     single-source/Combos
+    single-source/CountAlgo
     single-source/DataBenchmarks
     single-source/DeadArray
     single-source/DictOfArraysToArrayOfDicts

benchmark/scripts/Benchmark_Driver

@@ -434,7 +434,7 @@ class BenchmarkDoctor(object):
         measurements = dict(
             [('{0} {1} i{2}{3}'.format(benchmark, o, i, suffix),
               self.driver.run(benchmark, num_samples=s, num_iters=i,
-                              verbose=True))
+                              verbose=True, measure_memory=True))
              for o in opts
              for s, i in run_args
              for suffix in list('abcde')

benchmark/scripts/compare_perf_tests.py

@@ -34,6 +34,7 @@ class `ReportFormatter` creates the test comparison report in specified format.
 import sys
 from bisect import bisect, bisect_left, bisect_right
 from collections import namedtuple
+from decimal import Decimal, ROUND_HALF_EVEN
 from math import sqrt
 
 
@@ -141,20 +142,32 @@ def max(self):
         """Maximum sampled value."""
         return self.samples[-1].runtime
 
+    def quantile(self, q):
+        """Return runtime of a sample nearest to the quantile.
+
+        Explicitly uses round-half-to-even rounding algorithm to match the
+        behavior of numpy's quantile(interpolation='nearest') and quantile
+        estimate type R-3, SAS-2. See:
+        https://en.wikipedia.org/wiki/Quantile#Estimating_quantiles_from_a_sample
+        """
+        index = int(Decimal((self.count - 1) * Decimal(q))
+                    .quantize(0, ROUND_HALF_EVEN))
+        return self.samples[index].runtime
+
     @property
     def median(self):
         """Median sampled value."""
-        return self.samples[self.count / 2].runtime
+        return self.quantile(0.5)
 
     @property
     def q1(self):
         """First Quartile (25th Percentile)."""
-        return self.samples[self.count / 4].runtime
+        return self.quantile(0.25)
 
     @property
     def q3(self):
         """Third Quartile (75th Percentile)."""
-        return self.samples[(self.count / 2) + (self.count / 4)].runtime
+        return self.quantile(0.75)
 
     @property
     def iqr(self):
@@ -487,7 +500,7 @@ def __init__(self, comparator, old_branch, new_branch, changes_only,
 {0} ({1}): {2}"""
 
     PERFORMANCE_TEST_RESULT_HEADER = ('TEST', 'MIN', 'MAX', 'MEAN', 'MAX_RSS')
-    RESULT_COMPARISON_HEADER = ('TEST', 'OLD', 'NEW', 'DELTA', 'SPEEDUP')
+    RESULT_COMPARISON_HEADER = ('TEST', 'OLD', 'NEW', 'DELTA', 'RATIO')
 
     @staticmethod
     def header_for(result):

benchmark/scripts/test_Benchmark_Driver.py

@@ -476,10 +476,10 @@ def test_measure_10_independent_1s_benchmark_series(self):
             # 5x i1 series, with 300 μs runtime its possible to take 4098
             # samples/s, but it should be capped at 2k
             ([(_run('B1', num_samples=2048, num_iters=1,
-                    verbose=True), _PTR(min=300))] * 5) +
+                    verbose=True, measure_memory=True), _PTR(min=300))] * 5) +
             # 5x i2 series
             ([(_run('B1', num_samples=2048, num_iters=2,
-                    verbose=True), _PTR(min=300))] * 5)
+                    verbose=True, measure_memory=True), _PTR(min=300))] * 5)
         ))
         doctor = BenchmarkDoctor(self.args, driver)
         with captured_output() as (out, _):

benchmark/scripts/test_compare_perf_tests.py

@@ -75,13 +75,13 @@ def test_computes_five_number_summary(self):
             self.samples, (1000, 1000, 1000, 1000, 1000))
         self.samples.add(Sample(2, 1, 1100))
         self.assertEqualFiveNumberSummary(
-            self.samples, (1000, 1000, 1100, 1100, 1100))
+            self.samples, (1000, 1000, 1000, 1100, 1100))
         self.samples.add(Sample(3, 1, 1050))
         self.assertEqualFiveNumberSummary(
-            self.samples, (1000, 1000, 1050, 1050, 1100))
+            self.samples, (1000, 1000, 1050, 1100, 1100))
         self.samples.add(Sample(4, 1, 1025))
         self.assertEqualFiveNumberSummary(
-            self.samples, (1000, 1025, 1050, 1100, 1100))
+            self.samples, (1000, 1025, 1050, 1050, 1100))
         self.samples.add(Sample(5, 1, 1075))
         self.assertEqualFiveNumberSummary(
             self.samples, (1000, 1025, 1050, 1075, 1100))
@@ -156,11 +156,12 @@ def test_excludes_outliers_zero_IQR(self):
         self.samples.add(Sample(0, 2, 23))
         self.samples.add(Sample(1, 2, 18))
         self.samples.add(Sample(2, 2, 18))
+        self.samples.add(Sample(3, 2, 18))
         self.assertEquals(self.samples.iqr, 0)
 
         self.samples.exclude_outliers()
 
-        self.assertEquals(self.samples.count, 2)
+        self.assertEquals(self.samples.count, 3)
         self.assertEqualStats(
             (self.samples.min, self.samples.max), (18, 18))
 
@@ -368,7 +369,6 @@ def test_parse_results_verbose(self):
     Sample 0,11812
     Measuring with scale 90.
     Sample 1,13898
-    Measuring with scale 91.
     Sample 2,11467
 1,AngryPhonebook,3,11467,13898,12392,1315,11812
 Running Array2D for 3 samples.
@@ -388,7 +388,7 @@ def test_parse_results_verbose(self):
         )
         self.assertEquals(r.num_samples, r.samples.num_samples)
         self.assertEquals(results[0].samples.all_samples,
-                          [(0, 78, 11812), (1, 90, 13898), (2, 91, 11467)])
+                          [(0, 78, 11812), (1, 90, 13898), (2, 90, 11467)])
 
         r = results[1]
         self.assertEquals(
@@ -587,21 +587,21 @@ def test_column_headers(self):
         comparison_result = self.tc.increased[0]
         self.assertEquals(
             ReportFormatter.header_for(comparison_result),
-            ('TEST', 'OLD', 'NEW', 'DELTA', 'SPEEDUP')
+            ('TEST', 'OLD', 'NEW', 'DELTA', 'RATIO')
         )
         self.assert_markdown_contains([
-            'TEST                  | OLD    | NEW    | DELTA   | SPEEDUP',
+            'TEST                  | OLD    | NEW    | DELTA   | RATIO',
             '---                   | ---    | ---    | ---     | ---    ',
             'TEST                  | MIN    | MAX    | MEAN    | MAX_RSS'])
         self.assert_git_contains([
-            'TEST                    OLD      NEW      DELTA     SPEEDUP',
+            'TEST                    OLD      NEW      DELTA     RATIO',
             'TEST                    MIN      MAX      MEAN      MAX_RSS'])
         self.assert_html_contains([
             """
                 <th align='left'>OLD</th>
                 <th align='left'>NEW</th>
                 <th align='left'>DELTA</th>
-                <th align='left'>SPEEDUP</th>""",
+                <th align='left'>RATIO</th>""",
             """
                 <th align='left'>MIN</th>
                 <th align='left'>MAX</th>
@@ -764,12 +764,12 @@ class Test_compare_perf_tests_main(OldAndNewLog, FileSystemIntegration):
     """Integration test that invokes the whole comparison script."""
     markdown = [
         '<summary>Regression (1)</summary>',
-        'TEST                  | OLD    | NEW    | DELTA   | SPEEDUP',
+        'TEST                  | OLD    | NEW    | DELTA   | RATIO',
         'BitCount              | 3      | 9      | +199.9% | **0.33x**',
     ]
     git = [
         'Regression (1):',
-        'TEST                    OLD      NEW      DELTA     SPEEDUP',
+        'TEST                    OLD      NEW      DELTA     RATIO',
         'BitCount                3        9        +199.9%   **0.33x**',
     ]
     html = ['<html>', "<td align='left'>BitCount</td>"]