Merge pull request #5 from apple/master

ddd

Author: JacobMao

.dir-locals.el

@@ -20,7 +20,8 @@
   (fill-column . 80)
   (c-file-style . "swift"))
  (c++-mode
-  (whitespace-style face lines indentation:space))
+  (whitespace-style face lines indentation:space)
+  (flycheck-clang-language-standard . "c++14"))
  (c-mode
   (whitespace-style face lines indentation:space))
  (objc-mode

CHANGELOG.md

@@ -6,6 +6,7 @@ CHANGELOG
 
 | Contents               |
 | :--------------------- |
+| [Swift 5.0](#swift-50) |
 | [Swift 4.1](#swift-41) |
 | [Swift 4.0](#swift-40) |
 | [Swift 3.1](#swift-31) |
@@ -19,9 +20,36 @@ CHANGELOG
 
 </details>
 
+Swift 5.0
+---------
+
+* C macros containing casts are no longer imported to Swift if the type in the
+  cast is unavailable or deprecated, or produces some other diagnostic when
+  referenced. (These macros were already only imported under very limited
+  circumstances with very simple values, so this is unlikely to affect
+  real-world code.)
+
+
 Swift 4.1
 ---------
 
+* [SE-0189][]
+
+  If an initializer is declared in a different module from a struct, it must
+  use `self.init(…)` or `self = …` before returning or accessing `self`.
+  Failure to do so will produce a warning in Swift 4 and an error in Swift 5.
+  This is to keep a client app from accidentally depending on a library's
+  implementation details, and matches an existing restriction for classes,
+  where cross-module initializers must be convenience initializers.
+
+  This will most commonly affect code that extends a struct imported from C.
+  However, most imported C structs are given a zeroing no-argument initializer,
+  which can be called as `self.init()` before modifying specific properties.
+
+  Swift library authors who wish to continue allowing initialization on a
+  per-member basis should explicitly declare a public memberwise initializer
+  for clients in other modules to use.
+
 * [SE-0166][] / [SE-0143][]
 
   The standard library now defines the conformances of `Optional`,
@@ -6828,4 +6856,10 @@ Swift 1.0
 [SE-0184]: <https://github.com/apple/swift-evolution/blob/master/proposals/0184-unsafe-pointers-add-missing.md>
 [SE-0185]: <https://github.com/apple/swift-evolution/blob/master/proposals/0185-synthesize-equatable-hashable.md>
 [SE-0186]: <https://github.com/apple/swift-evolution/blob/master/proposals/0186-remove-ownership-keyword-support-in-protocols.md>
+[SE-0187]: <https://github.com/apple/swift-evolution/blob/master/proposals/0187-introduce-filtermap.md>
 [SE-0188]: <https://github.com/apple/swift-evolution/blob/master/proposals/0188-stdlib-index-types-hashable.md>
+[SE-0189]: <https://github.com/apple/swift-evolution/blob/master/proposals/0189-restrict-cross-module-struct-initializers.md>
+[SE-0190]: <https://github.com/apple/swift-evolution/blob/master/proposals/0190-target-environment-platform-condition.md>
+[SE-0191]: <https://github.com/apple/swift-evolution/blob/master/proposals/0191-eliminate-indexdistance.md>
+[SE-0192]: <https://github.com/apple/swift-evolution/blob/master/proposals/0192-non-exhaustive-enums.md>
+[SE-0193]: <https://github.com/apple/swift-evolution/blob/master/proposals/0193-cross-module-inlining-and-specialization.md>

CMakeLists.txt

@@ -207,6 +207,10 @@ option(SWIFT_RUNTIME_CRASH_REPORTER_CLIENT
     "Whether to enable CrashReporter integration"
     FALSE)
 
+option(SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
+    "Enable the Swift stable ABI's class marker bit"
+    FALSE)
+
 set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
     "The name of the toolchain to pass to 'xcrun'")
 
@@ -292,6 +296,10 @@ option(SWIFT_STDLIB_ENABLE_SIL_OWNERSHIP
   "Build the standard libraries and overlays with sil ownership enabled."
   FALSE)
 
+option(SWIFT_ENABLE_GUARANTEED_NORMAL_ARGUMENTS
+  "Build the standard libraries, overlays, and runtime with normal arguments at +0"
+  FALSE)
+
 #
 # End of user-configurable options.
 #

README.md

@@ -4,7 +4,7 @@
 
 | | **Swift** | **Package** |
 |---|:---:|:---:|
-|**macOS**         |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-osx/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-osx)|[![Build Status](https://ci.swift.org/job/oss-swift-package-osx/badge/icon)](https://ci.swift.org/job/oss-swift-package-osx)|
+|**macOS**        |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-osx/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-osx)|[![Build Status](https://ci.swift.org/job/oss-swift-package-osx/badge/icon)](https://ci.swift.org/job/oss-swift-package-osx)|
 |**Ubuntu 14.04** |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-14_04/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-14_04)|[![Build Status](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-14_04/badge/icon)](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-14_04)|
 |**Ubuntu 16.04** |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-16_04/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-16_04)|[![Build Status](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_04/badge/icon)](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_04)|
 |**Ubuntu 16.10** |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-16_10/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-16_10)|[![Build Status](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_10/badge/icon)](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_10)|
@@ -54,7 +54,7 @@ supported host development operating systems.
 
 #### macOS
 
-To build for macOS, you need [Xcode 9.2 beta 2](https://developer.apple.com/xcode/downloads/).
+To build for macOS, you need [Xcode 9.3 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.
@@ -114,7 +114,7 @@ options such as building a Swift-compatible LLDB, building the Swift Package
 Manager, building for various platforms, running tests after builds, and more.
 
 There are two primary build systems to use: Xcode and Ninja. The Xcode build
-system allows you to work in Xcode.app, but Ninja is a bit faster and supports
+system allows you to work in Xcode, but Ninja is a bit faster and supports
 more environments.
 
 To build using Ninja, run:
@@ -143,7 +143,7 @@ information, see the inline help:
 #### Xcode
 
 To build using Xcode, specify the `--xcode` argument on any of the above commands.
-Xcode.app can be used to edit the Swift source code, but it is not currently
+Xcode can be used to edit the Swift source code, but it is not currently
 fully supported as a build environment for SDKs other than macOS. The generated
 Xcode project does not integrate with the test runner, but the tests can be run
 with the 'check-swift' target.
@@ -159,7 +159,7 @@ helps to save this directory as an environment variable for future use.
 
 #### Ninja
 
-Once the first build has completed, ninja can perform fast incremental builds of
+Once the first build has completed, Ninja can perform fast incremental builds of
 various products. These incremental builds are a big timesaver when developing
 and debugging.
 
@@ -210,17 +210,19 @@ See [docs/Testing.md](docs/Testing.md), in particular the section on [lit.py](do
 
 ## Learning More
 
-Be sure to look through the [docs/] docs directory for more information about the
-compiler. In particular, the document on [Debugging The Compiler](docs/DebuggingTheCompiler.rst),
-and [Continuous Integration.md](docs/ContinuousIntegration.md) are very helpful
-to understand before submitting your first PR.
+Be sure to look through the [docs](https://github.com/apple/swift/tree/master/docs)
+directory for more information about the compiler. In particular, the documents
+titled [Debugging the Swift Compiler](docs/DebuggingTheCompiler.rst) and
+[Continuous Integration for Swift](docs/ContinuousIntegration.md) are very
+helpful to understand before submitting your first PR.
 
 ### Building Documentation
 
 To read the compiler documentation, start by installing the
-[Sphinx](http://sphinx-doc.org) documentation generator tool by running the command:
+[Sphinx](http://sphinx-doc.org) documentation generator tool by running the
+command:
 
-`easy_install -U Sphinx`
+    easy_install -U Sphinx
 
 Once complete, you can build the Swift documentation by changing directory into
 [docs](https://github.com/apple/swift/tree/master/docs) and typing `make`. This

benchmark/CMakeLists.txt

@@ -40,16 +40,22 @@ set(SWIFT_BENCH_MODULES
     single-source/ArrayOfRef
     single-source/ArraySetElement
     single-source/ArraySubscript
+    single-source/BinaryFloatingPointConversionFromBinaryInteger
     single-source/BitCount
     single-source/ByteSwap
+    single-source/COWTree
     single-source/CString
+    single-source/CSVParsing
     single-source/Calculator
     single-source/CaptureProp
     single-source/CharacterLiteralsLarge
     single-source/CharacterLiteralsSmall
+    single-source/CharacterProperties
     single-source/Chars
     single-source/ClassArrayGetter
+    single-source/Combos
     single-source/DeadArray
+    single-source/DictOfArraysToArrayOfDicts
     single-source/DictTest
     single-source/DictTest2
     single-source/DictTest3
@@ -59,6 +65,7 @@ set(SWIFT_BENCH_MODULES
     single-source/DictionaryRemove
     single-source/DictionarySubscriptDefault
     single-source/DictionarySwap
+    single-source/DoubleWidthDivision
     single-source/DropFirst
     single-source/DropLast
     single-source/DropWhile
@@ -75,13 +82,16 @@ set(SWIFT_BENCH_MODULES
     single-source/Join
     single-source/LazyFilter
     single-source/LinkedList
+    single-source/LuhnAlgoEager
+    single-source/LuhnAlgoLazy
     single-source/MapReduce
     single-source/Memset
     single-source/MonteCarloE
     single-source/MonteCarloPi
     single-source/NSDictionaryCastToSwift
     single-source/NSError
     single-source/NSStringConversion
+    single-source/NibbleSort
     single-source/NopDeinit
     single-source/ObjectAllocation
     single-source/ObjectiveCBridging
@@ -92,7 +102,9 @@ set(SWIFT_BENCH_MODULES
     single-source/ObserverPartiallyAppliedMethod
     single-source/ObserverUnappliedMethod
     single-source/OpenClose
+    single-source/PartialApplyDynamicType
     single-source/Phonebook
+    single-source/PointerArithmetics
     single-source/PolymorphicCalls
     single-source/PopFront
     single-source/PopFrontGeneric
@@ -105,9 +117,11 @@ set(SWIFT_BENCH_MODULES
     single-source/RGBHistogram
     single-source/RangeAssignment
     single-source/RangeIteration
+    single-source/RangeReplaceableCollectionPlusDefault
     single-source/RecursiveOwnedParameter
     single-source/ReduceInto
     single-source/ReversedCollections
+    single-source/RomanNumbers
     single-source/SetTests
     single-source/SevenBoom
     single-source/Sim2DArray
@@ -124,6 +138,7 @@ set(SWIFT_BENCH_MODULES
     single-source/StringEnum
     single-source/StringInterpolation
     single-source/StringMatch
+    single-source/StringRemoveDupes
     single-source/StringTests
     single-source/StringWalk
     single-source/Substring
@@ -133,6 +148,7 @@ set(SWIFT_BENCH_MODULES
     single-source/TypeFlood
     single-source/UTF8Decode
     single-source/Walsh
+    single-source/WordCount
     single-source/XorLoop
 )
 
@@ -217,6 +233,20 @@ option(SWIFT_BENCHMARK_GENERATE_OPT_VIEW
   "Produce optimization view for benchmarks"
   FALSE)
 
+set(SWIFT_BENCHMARK_OPT_VIEWER "" CACHE FILEPATH
+  "Path to opt-viewer")
+
+if(SWIFT_BENCHMARK_OPT_VIEWER)
+  # If the path to the opt-viewer was specified manually and we have no access
+  # to the LLVM tree, assume we have the modules for the opt-viewer installed.
+  if(SWIFT_BENCHMARK_BUILT_STANDALONE)
+    set(LLVM_HAVE_OPT_VIEWER_MODULES 1)
+  endif()
+else()
+  set (SWIFT_BENCHMARK_OPT_VIEWER
+    "${LLVM_BUILD_MAIN_SRC_DIR}/tools/opt-viewer/opt-viewer.py")
+endif()
+
 # Options for other configurations
 set(BENCHOPTS_MULTITHREADED
     "-whole-module-optimization" "-num-threads" "4")

benchmark/README.md

@@ -111,22 +111,6 @@ of some benchmarks.
 ** FIXME ** `gyb` should be invoked automatically during the
    build so that manually invoking `generate_harness.py` is not required.
 
-### Generating harness files
-
-To generate `CMakeLists.txt` and `utils/main.swift` from test sources, run the
-command:
-
-    $ scripts/generate_harness/generate_harness.py
-
-### Modifying CMakeLists.txt or utils/main.swift
-
-To make changes to `CMakeLists.txt` or `utils/main.swift`, modify the template
-files `CMakeLists.txt.gyb` and `main.swift.gyb` These are templates, rendered by
-`gyb` in `generate_harness.py`, so ensure static changes don't interfere
-with the template portions. Test changes by
-[regenerating the harness](#generating-harness-files) and rebuilding the
-repository with `build-script`.
-
 Adding New Benchmarks
 ---------------------
 
@@ -136,9 +120,8 @@ To add a new single file test:
 
 1.  Add a new Swift file (`YourTestNameHere.swift`), built according to
     the template below, to the `single-source` directory.
-2.  Regenerate harness files by following the directions in
-    [Generating harness files](#generating-harness-files) before committing
-    changes.
+2.  Add the filename of the new Swift file to CMakeLists.txt
+3.  Edit `main.swift`. Import and register your new Swift module.
 
 To add a new multiple file test:
 
@@ -151,17 +134,19 @@ To add a new multiple file test:
         |   |   +-- TestFile2.swift
         |   |   +-- TestFile3.swift
 
-    At least one run function (specified in the template below) must
-    exist in the files.
+    At least one file must define a public `YourTestName` variable, initialized to an
+    instance of BenchmarkInfo (specified in the template below).
+
+2.  In `CMakeLists.txt` add the new directory name to
+    `SWIFT_MULTISOURCE_SWIFT3_BENCHES`, and set `YourTestName_sources` to the
+    list of source file paths.
 
-2.  Regenerate harness files by following the directions in
-    [Generating harness files](#generating-harness-files) before committing
-    changes.
+3.  Edit `main.swift`. Import and register your new Swift module.
 
 **Note:**
 
-The generator script looks for functions prefixed with `run_` in order to
-populate `utils/main.swift`.
+The benchmark harness will execute the routine referenced by
+`BenchmarkInfo.runFunction`.
 
 The benchmark driver will measure the time taken for `N = 1` and automatically calculate
 the necessary number of iterations `N` to run each benchmark in approximately one second,
@@ -175,14 +160,18 @@ If needed you can multiply N by a fixed amount (e.g. `1...100*N`) to achieve thi
 **Performance Test Template**
 
 ``` {.sourceCode .swift}
-// YourTestNameHere benchmark
+// YourTestName benchmark
 //
 // rdar://problem/00000000
-import Foundation
 import TestsUtils
 
+public let YourTestName = BenchmarkInfo(
+  name: "YourTestName",
+  runFunction: run_YourTestName,
+  tags: [.regression])
+
 @inline(never)
-public func run_YourTestNameHere(N: Int) {
+public func run_YourTestName(N: Int) {
     # Declare variables
 
     for i in 1...N {
@@ -194,3 +183,6 @@ public func run_YourTestNameHere(N: Int) {
     # Assert with CheckResults that work was done
 }
 ```
+
+The current set of tags are defined by the `BenchmarkCategory` enum in
+`TestsUtils.swift` .