---

yaml
---
r: 335359
b: refs/heads/rxwei-patch-1
c: e7c6518
h: refs/heads/master
i:
  335357: 958ea42
  335355: 00fef3a
  335351: fb73f2a
  335343: ce7177a
  335327: 67080b3
  335295: f7ba9ba
  335231: cbb3138
  335103: 6a68d2b
  334847: 69a99c5

Author: Joe Shajrawi

[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: c2aab0018f997dbca89fe599b68b7c718e238f2e
+refs/heads/rxwei-patch-1: e7c6518c7bea07d464db902c4a26058a9a2a2c2f
 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

@@ -6,7 +6,6 @@ CHANGELOG
 
 | Contents               |
 | :--------------------- |
-| [Swift 5.1](#swift-51) |
 | [Swift 5.0](#swift-50) |
 | [Swift 4.2](#swift-42) |
 | [Swift 4.1](#swift-41) |
@@ -25,78 +24,8 @@ CHANGELOG
 Swift 5.1
 ---------
 
-* [SR-7799][]:
-
-  Enum cases can now be matched against an optional enum without
-  requiring a '?' at the end of the pattern.
-
-  ```swift
-  enum Foo { case zero, one }
-
-  let foo: Foo? = .zero
-
-  switch foo {
-    case .zero: break
-    case .one: break
-    case .none: break
-  }
-  ```
-
-* `weak` and `unowned` variables can now be used inside types that
-   declare `Equatable` or `Hashable` conformance.
-
-* [SR-2688][]:
-
-  An `@autoclosure` closure can now be a typealias.
-
-  ```swift
-  class Foo {
-    typealias FooClosure = () -> String
-    func fooFunction(closure: @autoclosure FooClosure) {}
-  }
-  ```
-
-* [SR-7601][]:
-
-  Functions marked with `@objc` can now return `Self`
-
-  ```swift
-  @objc func returnDynamicSelf() -> Self { return self }
-  ```
-
-* [SR-2176][]:
-
-  Assigning '.none' to an optional enum which also has a 'none' case
-  or comparing such an enum with '.none' will now warn. Such expressions
-  create an ambiguity because the compiler chooses Optional.none
-  over Foo.none.
-
-  ```swift
-  enum Foo { case none }
-
-  // Assigned Optional.none instead of Foo.none
-  let foo: Foo? = .none
-  // Comparing with Optional.none instead of Foo.none
-  let isEqual = foo == .none
-  ```
-
-  The compiler will provide a warning along with a fix-it to
-  replace '.none' with 'Optional.none' or 'Foo.none' to resolve
-  the ambiguity.
-
 * Key path expressions can now include references to tuple elements.
 
-* Single-parameter functions accepting values of type `Any` are no
-  longer preferred over other functions.
-
-  ```swift
-  func foo(_: Any) { print("Any") }
-  func foo<T>(_: T) { print("T") }
-  foo(0) // prints "Any" in Swift < 5.1, "T" in Swift 5.1
-  ```
-
-**Add new entries to the top of this section, not here!**
-
 Swift 5.0
 ---------
 
@@ -7511,16 +7440,12 @@ Swift 1.0
 [SR-1446]: <https://bugs.swift.org/browse/SR-1446>
 [SR-1529]: <https://bugs.swift.org/browse/SR-1529>
 [SR-2131]: <https://bugs.swift.org/browse/SR-2131>
-[SR-2176]: <https://bugs.swift.org/browse/SR-2176>
 [SR-2388]: <https://bugs.swift.org/browse/SR-2388>
 [SR-2394]: <https://bugs.swift.org/browse/SR-2394>
 [SR-2608]: <https://bugs.swift.org/browse/SR-2608>
-[SR-2688]: <https://bugs.swift.org/browse/SR-2688>
 [SR-4248]: <https://bugs.swift.org/browse/SR-4248>
 [SR-5581]: <https://bugs.swift.org/browse/SR-5581>
 [SR-5719]: <https://bugs.swift.org/browse/SR-5719>
 [SR-7139]: <https://bugs.swift.org/browse/SR-7139>
 [SR-7251]: <https://bugs.swift.org/browse/SR-7251>
-[SR-7601]: <https://bugs.swift.org/browse/SR-7601>
-[SR-7799]: <https://bugs.swift.org/browse/SR-7799>
 [SR-8109]: <https://bugs.swift.org/browse/SR-8109>

branches/rxwei-patch-1/CMakeLists.txt

@@ -11,17 +11,12 @@ endif()
 list(APPEND CMAKE_MODULE_PATH
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
-if(DEFINED CMAKE_JOB_POOLS)
-  # CMake < 3.11 doesn't support CMAKE_JOB_POOLS. Manually set the property.
-  set_property(GLOBAL PROPERTY JOB_POOLS "${CMAKE_JOB_POOLS}")
-else()
-  # Make a job pool for things that can't yet be distributed
-  cmake_host_system_information(
-    RESULT localhost_logical_cores QUERY NUMBER_OF_LOGICAL_CORES)
-  set_property(GLOBAL PROPERTY JOB_POOLS local_jobs=${localhost_logical_cores})
-  # Put linking in that category
-  set(CMAKE_JOB_POOL_LINK local_jobs)
-endif()
+# Make a job pool for things that can't yet be distributed
+cmake_host_system_information(
+  RESULT localhost_logical_cores QUERY NUMBER_OF_LOGICAL_CORES)
+set_property(GLOBAL PROPERTY JOB_POOLS local_jobs=${localhost_logical_cores})
+# Put linking in that category
+set_property(GLOBAL PROPERTY JOB_POOL_LINK local_jobs)
 
 ENABLE_LANGUAGE(C)
 
@@ -106,6 +101,25 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   message(STATUS "No build type was specified, will default to ${CMAKE_BUILD_TYPE}")
 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]")
+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)
+  set(SWIFT_STDLIB_ASSERTIONS_default FALSE)
+else()
+  set(SWIFT_STDLIB_ASSERTIONS_default TRUE)
+endif()
+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_BUILD_RUNTIME_WITH_HOST_COMPILER
+       "Use the host compiler and not the internal clang to build the swift runtime"
+       FALSE)
+
 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
@@ -132,53 +146,6 @@ set(SWIFT_ENABLE_LLD_LINKER TRUE CACHE BOOL
 set(SWIFT_ENABLE_GOLD_LINKER TRUE CACHE BOOL
     "Enable using the gold linker when available")
 
-set(SWIFT_TOOLS_ENABLE_LTO OFF CACHE STRING "Build Swift tools with LTO. One
-    must specify the form of LTO by setting this to one of: 'full', 'thin'. This
-    option only affects the tools that run on the host (the compiler), and has
-    no effect on the target libraries (the standard library and the runtime).")
-
-# The following only works with the Ninja generator in CMake >= 3.0.
-set(SWIFT_PARALLEL_LINK_JOBS "" CACHE STRING
-  "Define the maximum number of linker jobs for swift.")
-
-option(SWIFT_FORCE_OPTIMIZED_TYPECHECKER "Override the optimization setting of
-  the type checker so that it always compiles with optimization. This eases
-  debugging after type checking occurs by speeding up type checking" FALSE)
-
-# Allow building Swift with Clang's Profile Guided Optimization
-if(SWIFT_PROFDATA_FILE AND EXISTS ${SWIFT_PROFDATA_FILE})
-  if(NOT CMAKE_C_COMPILER_ID MATCHES Clang)
-    message(FATAL_ERROR "SWIFT_PROFDATA_FILE can only be specified when compiling with clang")
-  endif()
-  add_definitions("-fprofile-instr-use=${SWIFT_PROFDATA_FILE}")
-endif()
-
-#
-# User-configurable Swift Standard Library specific options.
-#
-# TODO: Once the stdlib/compiler builds are split, this should be sunk into the
-# stdlib cmake.
-#
-
-set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
-    "Build type for the Swift standard library and SDK overlays [Debug, RelWithDebInfo, Release, MinSizeRel]")
-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)
-  set(SWIFT_STDLIB_ASSERTIONS_default FALSE)
-else()
-  set(SWIFT_STDLIB_ASSERTIONS_default TRUE)
-endif()
-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_BUILD_RUNTIME_WITH_HOST_COMPILER
-       "Use the host compiler and not the internal clang to build the swift runtime"
-       FALSE)
-
 set(SWIFT_SDKS "" CACHE STRING
     "If non-empty, limits building target binaries only to specified SDKs (despite other SDKs being available)")
 
@@ -194,15 +161,32 @@ set(SWIFT_NATIVE_CLANG_TOOLS_PATH "" CACHE STRING
     "Path to the directory that contains Clang tools that are executable on the build machine")
 
 set(SWIFT_NATIVE_SWIFT_TOOLS_PATH "" CACHE STRING
-   "Path to the directory that contains Swift tools that are executable on the build machine")
+    "Path to the directory that contains Swift tools that are executable on the build machine")
+
+set(SWIFT_TOOLS_ENABLE_LTO OFF CACHE STRING "Build Swift tools with LTO. One
+    must specify the form of LTO by setting this to one of: 'full', 'thin'. This
+    option only affects the tools that run on the host (the compiler), and has
+    no effect on the target libraries (the standard library and the runtime).")
+
+# The following only works with the Ninja generator in CMake >= 3.0.
+set(SWIFT_PARALLEL_LINK_JOBS "" CACHE STRING
+  "Define the maximum number of linker jobs for swift.")
+
+option(SWIFT_FORCE_OPTIMIZED_TYPECHECKER "Override the optimization setting of
+  the type checker so that it always compiles with optimization. This eases
+  debugging after type checking occurs by speeding up type checking" FALSE)
 
 option(SWIFT_ENABLE_PARSEABLE_MODULE_INTERFACES
        "Generate .swiftinterface files alongside .swiftmodule files"
        TRUE)
 
-option(SWIFT_STDLIB_ENABLE_SIB_TARGETS
-       "Should we generate sib targets for the stdlib or not?"
-       FALSE)
+# Allow building Swift with Clang's Profile Guided Optimization
+if(SWIFT_PROFDATA_FILE AND EXISTS ${SWIFT_PROFDATA_FILE})
+  if(NOT CMAKE_C_COMPILER_ID MATCHES Clang)
+    message(FATAL_ERROR "SWIFT_PROFDATA_FILE can only be specified when compiling with clang")
+  endif()
+  add_definitions("-fprofile-instr-use=${SWIFT_PROFDATA_FILE}")
+endif()
 
 #
 # User-configurable Android specific options.
@@ -251,8 +235,8 @@ option(SWIFT_RUNTIME_CRASH_REPORTER_CLIENT
     FALSE)
 
 option(SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
-    "Enable the Swift stable ABI's class marker bit for new deployment targets"
-    TRUE)
+    "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'")

branches/rxwei-patch-1/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

@@ -77,11 +77,6 @@ macro(configure_sdks_darwin)
   set(appletvos_ver "9.1")
   set(watchos_ver "2.0")
 
-  set(macosx_vendor "apple")
-  set(iphoneos_vendor "apple")
-  set(appletvos_vendor "apple")
-  set(watchos_vendor "apple")
-
   set(macosx_triple_platform "macosx")
   set(iphoneos_triple_platform "ios")
   set(appletvos_triple_platform "tvos")