tienex · hpux735 · Jan 24, 2016 · Jan 24, 2016 · Jan 24, 2016 · Jan 24, 2016
diff --git a/.dir-locals.el b/.dir-locals.el
@@ -2,7 +2,7 @@
 ;
 ; This source file is part of the Swift.org open source project
 ;
-; Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
+; Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
 ; Licensed under Apache License v2.0 with Runtime Library Exception
 ;
 ; See http://swift.org/LICENSE.txt for license information

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,49 @@
-Latest
-------
+
+Swift 3
+-------
+
+* Curried function syntax has been removed, and now produces a compile-time
+  error.
+
+
+Swift 2.2
+---------
+
+* Associated types in protocols can now be specified with a new 'associatedtype'
+  declaration, to replace the use of 'typealias':
+
+    protocol P {
+      associatedtype Ty
+    }
+
+  The typealias keyword is still allowed (but deprecated and produces a warning)
+  in Swift 2.2. This warning will become an error in Swift 3.
+
+* Curried function syntax has been deprecated, and is slated to be removed in 
+  Swift 3.
+
+* The ++ and -- operators have been deprecated, and are slated to be removed in
+  Swift 3.0.  As a replacement, please use "x += 1" on integer or floating point
+  types, and "x = x.successor()" on Index types.
+
+* The operator identifier lexer grammar has been revised to simplify the rules
+  for operators that start with a dot (".").  The new rule is that an operator
+  that starts with a dot may contain other dots in it, but operators that start
+  with some other character may not contain dots.  For example:
+
+    ```
+    x....foo   --> "x" "...." "foo"
+    x&%^.foo   --> "x" "&%^"  ".foo"
+    ```
+
+  This eliminates a special case for the ..< operator, folding it into a simple
+  and consistent rule.
+
+* The "C-style for loop", which is spelled `for init; comparison; increment {}`
+  has been deprecated and is slated for removal in Swift 3.0.  See
+  [SE-0007](https://github.com/apple/swift-evolution/blob/master/proposals/0007-remove-c-style-for-loops.md)
+  for more information.
+
 * Three new doc comment fields, namely `- keyword:`, `- recommended:`
   and `- recommendedover:`, allow Swift users to cooperate with code
   completion engine to deliver more effective code completion results.
@@ -31,7 +75,8 @@ Latest
 * `ArraySlice.removeFirst()` now preserves element indices.
 
 * Global `anyGenerator()` functions have been changed into initializers on
-  `AnyGenerator`, making the API more intuitive and idiomatic.
+  `AnyGenerator`, making the API more intuitive and idiomatic.  They have been
+  deprecated in Swift 2.2, and will be removed in Swift 3.
 
 * Closures appearing inside generic types and generic methods can now be
   converted to C function pointers as long as no generic type parameters
@@ -58,6 +103,78 @@ Latest
 
   **(rdar://problem/21683348)**
 
+* Argument labels and parameter names can now be any keyword except
+  `var`, `let`, or `inout`. For example:
+
+    NSURLProtectionSpace(host: "somedomain.com", port: 443, protocol: "https", realm: "Some Domain", authenticationMethod: "Basic")
+
+  would previously have required `protocol` to be surrounded in
+  back-ticks. For more information, see
+  [SE-0001](https://github.com/apple/swift-evolution/blob/master/proposals/0001-keywords-as-argument-labels.md).
+
+* Tuples (up to arity 6) whose elements are all `Comparable` or `Equatable` now
+  implement the full set of comparison/equality operators. The comparison
+  operators are defined in terms of [lexicographical order][]. See [SE-0015][]
+  for more information.
+
+[lexicographical order]: https://en.wikipedia.org/wiki/Lexicographical_order
+[SE-0015]: https://github.com/apple/swift-evolution/blob/master/proposals/0015-tuple-comparison-operators.md
+
+* The `@objc(SomeName)` attribute is now supported on enums and enum cases to
+  rename the generated Objective-C declaration.
+
+  **(rdar://problem/21930334)**
+
+* When referencing a function or initializer, one can provide the
+  complete name, including argument labels. For example:
+
+      let fn1 = someView.insertSubview(_:at:)
+      let fn2 = someView.insertSubview(_:aboveSubview:)
+
+      let buttonFactory = UIButton.init(type:)
+
+  For more information, see [SE-0021](https://github.com/apple/swift-evolution/blob/master/proposals/0021-generalized-naming.md).
+
+* There is a new build configuration function, `#if swift(>=x.y)`, which
+  tests if the current Swift language version is at least `x.y`. This
+  allows you to conditionally compile code for multiple language
+  versions in the same file, even with different syntax, by deactivating
+  parsing in inactive code blocks. For example:
+
+  ```swift
+  #if swift(>=2.2)
+    // Only this code will be parsed in Swift 3
+    func foo(x: Int) -> (y: Int) -> () {}
+  #else
+    // This code is ignored entirely.
+    func foo(x: Int)(y: Int) {}
+  #endif
+  ```
+
+  For more information, see [SE-0020](https://github.com/apple/swift-evolution/blob/master/proposals/0020-if-swift-version.md).
+
+* The Objective-C selector of a Swift method can now be determined
+  directly with the #selector expression, e.g.,:
+
+      let sel = #selector(insertSubview(_:aboveSubview:)) // sel has type Selector
+
+  Along with this change, the use of string literals as selectors has
+  been deprecated, e.g.,
+
+      let sel: Selector = "insertSubview:aboveSubview:"
+
+  Generally, such string literals should be replaced with uses of
+  `#selector`, and the compiler will provide Fix-Its that use
+  `#selector`. In cases where they is not possible (e.g., when referring
+  to the getter of a property), one can still directly construct
+  selectors, e.g.,:
+
+      let sel = Selector("propertyName")
+
+  Note that the compiler is now checking the string literals used to
+  construct Selectors to ensure that they are well-formed Objective-C
+  selectors and that there is an '@objc' method with that selector.
+
 
 2015-09-17 [Xcode 7.1, Swift 2.1]
 ----------
@@ -67,7 +184,7 @@ Latest
   allows you to use C enum pattern matching in switch statements with no
   additional code. **(17287720)**
 
-* The `NSNumberunsignedIntegerValue` property now has the type `UInt` instead
+* The `NSNumber.unsignedIntegerValue` property now has the type `UInt` instead
   of `Int`, as do other methods and properties that use the `NSUInteger` type
   in Objective-C and whose names contain `unsigned..`. Most other uses of
   `NSUInteger` in system frameworks are imported as `Int` as they were in
@@ -1342,7 +1459,7 @@ Latest
   unique elements with full value semantics. It bridges with `NSSet`, providing
   functionality analogous to `Array` and `Dictionary`. **(14661754)**
 
-* The `if–let` construct has been expanded to allow testing multiple optionals
+* The `if-let` construct has been expanded to allow testing multiple optionals
   and guarding conditions in a single `if` (or `while`) statement using syntax
   similar to generic constraints:
 
@@ -1356,7 +1473,7 @@ Latest
   conditions, without introducing undesirable nesting (for instance, to avoid
   the optional unwrapping _"pyramid of doom"_).
 
-  Further, `if–let` now also supports a single leading boolean condition along
+  Further, `if-let` now also supports a single leading boolean condition along
   with optional binding `let` clauses. For example:
 
   ```swift
@@ -1366,7 +1483,7 @@ Latest
 
   **(19797158, 19382942)**
 
-* The `if–let` syntax has been extended to support a single leading boolean
+* The `if-let` syntax has been extended to support a single leading boolean
   condition along with optional binding `let` clauses.
 
   For example:
@@ -3865,9 +3982,9 @@ Latest
   themselves.
 
   Overall, a property now may either be "stored" (the default), "computed"
-  (have a `get:` and optionally a `set:` specifier), or a observed
+  (have a `get:` and optionally a `set:` specifier), or an observed
   (`willSet`/`didSet`) property.  It is not possible to have a custom getter
-  or setter on a observed property, since they have storage.
+  or setter on an observed property, since they have storage.
 
   Two known-missing bits are:
   - **(rdar://problem/15920332) didSet/willSet variables need to allow initializers**

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,6 +28,10 @@ option(SWIFT_STDLIB_ASSERTIONS
     "Enable internal checks for the Swift standard library (useful for debugging the library itself, does not affect checks required for safety)"
     "${SWIFT_STDLIB_ASSERTIONS_default}")
 
+option(SWIFT_SERIALIZE_STDLIB_UNITTEST
+    "Compile the StdlibUnittest module with -sil-serialize-all to increase the test coverage for the optimizer"
+    FALSE)
+
 option(SWIFT_BUILD_TOOLS
     "Build the Swift compiler and other tools"
     TRUE)
@@ -44,17 +48,17 @@ option(SWIFT_BUILD_STATIC_STDLIB
     "Build static variants of the Swift standard library and SDK overlay"
     FALSE)
 
-option(SWIFT_INCLUDE_BENCHMARKS
-    "Create targets for running swift benchmarks"
-    TRUE)
+option(SWIFT_BUILD_PERF_TESTSUITE
+    "Create targets for swift performance benchmarks."
+    FALSE)
 
 option(SWIFT_INCLUDE_TESTS "Create targets for building/running tests." TRUE)
 
 option(SWIFT_INCLUDE_DOCS
     "Create targets for building docs."
     TRUE)
 
-set(SWIFT_VERSION "2.2" CACHE STRING
+set(SWIFT_VERSION "3.0" CACHE STRING
     "The user-visible version of the Swift compiler")
 set(SWIFT_VENDOR "" CACHE STRING
     "The vendor name of the Swift compiler")
@@ -69,7 +73,7 @@ set(SWIFT_ENABLE_GOLD_LINKER FALSE CACHE BOOL
     "Enable using the gold linker when available")
 
 set(_SWIFT_KNOWN_INSTALL_COMPONENTS
-    "compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;dev;sourcekit-xpc-service;sourcekit-inproc")
+    "compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc")
 
 # Set the SWIFT_INSTALL_COMPONENTS variable to the default value if it is not passed in via -D
 set(SWIFT_INSTALL_COMPONENTS "${_SWIFT_KNOWN_INSTALL_COMPONENTS}" CACHE STRING
@@ -125,6 +129,9 @@ option(SWIFT_RUNTIME_CRASH_REPORTER_CLIENT
     "Whether to enable CrashReporter integration"
     FALSE)
 
+set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
+    "The name of the toolchain to pass to 'xcrun'")
+
 set(SWIFT_DARWIN_ICU_INCLUDE_PATH "" CACHE STRING
     "Path to the directory where the ICU headers are located")
 
@@ -151,7 +158,7 @@ option(SWIFT_AST_VERIFIER
     "Enable the AST verifier in the built compiler, and run it on every compilation"
     TRUE)
 
-option(SWIFT_VERIFY_ALL
+option(SWIFT_SIL_VERIFY_ALL
     "Run SIL verification after each transform when building Swift files in the build process"
     FALSE)
 
@@ -180,11 +187,7 @@ set(SWIFT_EXPERIMENTAL_EXTRA_REGEXP_FLAGS "" CACHE STRING
   "A list of [module_regexp1;flags1;module_regexp2;flags2,...] which can be used to apply specific flags to modules that match a cmake regexp. It always applies the first regexp that matches.")
 
 set(SWIFT_EXPERIMENTAL_EXTRA_NEGATIVE_REGEXP_FLAGS "" CACHE STRING
-    "A list of [module_regexp1;flags1;module_regexp2;flags2,...] which can be used to apply specific flags to modules that do not match a cmake regexp. It always applies the first regexp that does not matche. The reason this is necessary is that cmake does not provide negative matches in the regex. Instead you have to use NOT in the if statement requiring a separate variable.")
-
-option(SWIFT_RUNTIME_ENABLE_DTRACE
-  "Should the runtime be built with dtrace instrumentation enabled"
-  FALSE)
+    "A list of [module_regexp1;flags1;module_regexp2;flags2,...] which can be used to apply specific flags to modules that do not match a cmake regexp. It always applies the first regexp that does not match. The reason this is necessary is that cmake does not provide negative matches in the regex. Instead you have to use NOT in the if statement requiring a separate variable.")
 
 option(SWIFT_RUNTIME_ENABLE_LEAK_CHECKER
   "Should the runtime be built with support for non-thread-safe leak detecting entrypoints"
@@ -222,9 +225,6 @@ endif()
 option(SWIFT_BUILD_SOURCEKIT
     "Build SourceKit"
     ${SWIFT_BUILD_SOURCEKIT_default})
-# Force updating the cache, remove the following after a couple of weeks or so.
-set(SWIFT_BUILD_SOURCEKIT ${SWIFT_BUILD_SOURCEKIT_default}
-    CACHE BOOL "Build SourceKit" FORCE)
 
 #
 # Include CMake modules
@@ -398,6 +398,11 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     configure_sdk_unix(LINUX "Linux" "linux" "linux" "x86_64" "x86_64-unknown-linux-gnu")
     set(SWIFT_HOST_VARIANT_ARCH "x86_64")
     set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
+  # FIXME: This only matches ARMv6l (by far the most common variant).
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv6l")
+    configure_sdk_unix(LINUX "Linux" "linux" "linux" "armv6" "armv6-unknown-linux-gnueabihf")
+    set(SWIFT_HOST_VARIANT_ARCH "armv6")
+    set(SWIFT_PRIMARY_VARIANT_ARCH_default "armv6")
   # FIXME: This only matches ARMv7l (by far the most common variant).
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
     configure_sdk_unix(LINUX "Linux" "linux" "linux" "armv7" "armv7-unknown-linux-gnueabihf")
@@ -407,6 +412,14 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     configure_sdk_unix(LINUX "Linux" "linux" "linux" "aarch64" "aarch64-unknown-linux-gnu")
     set(SWIFT_HOST_VARIANT_ARCH "aarch64")
     set(SWIFT_PRIMARY_VARIANT_ARCH_default "aarch64")
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64")
+    configure_sdk_unix(LINUX "Linux" "linux" "linux" "powerpc64" "powerpc64-unknown-linux-gnu")
+    set(SWIFT_HOST_VARIANT_ARCH "powerpc64")
+    set(SWIFT_PRIMARY_VARIANT_ARCH_default "powerpc64")
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64le")
+    configure_sdk_unix(LINUX "Linux" "linux" "linux" "powerpc64le" "powerpc64le-unknown-linux-gnu")
+    set(SWIFT_HOST_VARIANT_ARCH "powerpc64le")
+    set(SWIFT_PRIMARY_VARIANT_ARCH_default "powerpc64le")
   else()
     message(FATAL_ERROR "Unknown or unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
   endif()
@@ -461,7 +474,7 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
   endif()
 
   if(XCODE)
-    # FIXME: Can not cross-compile stdlib using Xcode.  Xcode insists on
+    # FIXME: Cannot cross-compile stdlib using Xcode.  Xcode insists on
     # passing -mmacosx-version-min to the compiler, and we want to pass
     # -mios-version-min.  Clang sees both options and complains.
     set(swift_can_crosscompile_stdlib FALSE)
@@ -584,6 +597,11 @@ endif()
 set(SWIFT_PRIMARY_VARIANT_SUFFIX
     "-${SWIFT_SDK_${SWIFT_PRIMARY_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_PRIMARY_VARIANT_ARCH}")
 
+# Clear universal library names to prevent adding duplicates
+foreach(sdk ${SWIFT_SDKS})
+  unset(UNIVERSAL_LIBRARY_NAMES_${SWIFT_SDK_${sdk}_LIB_SUBDIR} CACHE)
+endforeach()
+
 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}")
@@ -610,6 +628,10 @@ if(LIBXML2_FOUND)
   set(SWIFT_HAVE_LIBXML 1)
 endif()
 
+if (LLVM_ENABLE_DOXYGEN)
+  message(STATUS "Doxygen: enabled")
+endif()
+
 #
 # Set up global CMake variables for API notes.
 #
@@ -633,7 +655,7 @@ if(SWIFT_BUILD_TOOLS)
 endif()
 add_subdirectory(utils)
 add_subdirectory(stdlib)
-if(SWIFT_INCLUDE_BENCHMARKS)
+if(SWIFT_BUILD_PERF_TESTSUITE)
   add_subdirectory(benchmark)
 endif()
 if(SWIFT_INCLUDE_TESTS)
@@ -644,6 +666,10 @@ if(SWIFT_INCLUDE_DOCS)
   add_subdirectory(docs)
 endif()
 
+swift_install_in_component(license
+  FILES "LICENSE.txt"
+  DESTINATION "share/swift")
+
 # Add a documentation target so that documentation shows up in the
 # Xcode project.
 if(XCODE)

diff --git a/README.md b/README.md
@@ -56,9 +56,9 @@ with version 2 shipped with Ubuntu.
 If you are building on Ubuntu 14.04 LTS, you'll need to upgrade your clang
 compiler for C++14 support and create a symlink:
 
-     sudo apt-get install clang-3.6
-     sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.6 100
-     sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.6 100
+    sudo apt-get install clang-3.6
+    sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.6 100
+    sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.6 100
 
 ### Getting Sources for Swift and Related Projects
 

diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -1,13 +1,10 @@
-option(SWIFT_INCLUDE_PERF_TESTSUITE "Create targets for swift performance benchmarks." NO)
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   # Performance test harness only builds on Darwin.
-  if (SWIFT_INCLUDE_PERF_TESTSUITE)
-    set(PERF_TESTSUITE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/PerfTestSuite" CACHE STRING "Path to swift performance testsuite repo.")
-    if(EXISTS ${PERF_TESTSUITE_DIR}/CMakeLists.txt)
-      add_subdirectory(${PERF_TESTSUITE_DIR})
-    else()
-      message(FATAL_ERROR "Can't find the Swift performance suite at ${PERF_TESTSUITE_DIR}/.")
-    endif()
+  set(PERF_TESTSUITE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/PerfTestSuite" CACHE STRING "Path to swift performance testsuite repo.")
+  if(EXISTS ${PERF_TESTSUITE_DIR}/CMakeLists.txt)
+    add_subdirectory(${PERF_TESTSUITE_DIR})
+  else()
+    message(FATAL_ERROR "Can't find the Swift performance suite at ${PERF_TESTSUITE_DIR}/.")
   endif()
 endif()