Merge remote-tracking branch 'origin/master' into new-integer-protocols

Author: Max Moiseev

.dir-locals.el

@@ -5,7 +5,8 @@
   (eval let*
         ((x (dir-locals-find-file default-directory))
          (this-directory (if (listp x) (car x) (file-name-directory x))))
-        (unless (featurep 'swift-project-settings)
+        (unless (or (featurep 'swift-project-settings) 
+                    (tramp-tramp-file-p this-directory))
           (add-to-list 'load-path
                        (concat this-directory "utils")
                        :append)

CMakeLists.txt

@@ -270,6 +270,10 @@ option(SWIFT_STDLIB_ENABLE_RESILIENCE
     "Build the standard libraries and overlays with resilience enabled; see docs/LibraryEvolution.rst"
     FALSE)
 
+option(SWIFT_RUNTIME_ENABLE_COW_EXISTENTIALS
+    "Build the runtime with a copy-on-write implementation for opaque existentials"
+    FALSE)
+
 option(SWIFT_STDLIB_USE_NONATOMIC_RC
     "Build the standard libraries and overlays with nonatomic reference count operations enabled"
     FALSE)
@@ -416,10 +420,10 @@ swift_configure_components()
 # lipo is used to create universal binaries.
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
   include(SwiftDarwin)
-  if(SWIFT_LIPO)
-    set(LIPO ${SWIFT_LIPO})
+  if(CMAKE_LIPO)
+    set(CMAKE_LIPO ${CMAKE_LIPO})
   else()
-    find_toolchain_tool(LIPO "${SWIFT_DARWIN_XCRUN_TOOLCHAIN}" lipo)
+    find_toolchain_tool(CMAKE_LIPO "${SWIFT_DARWIN_XCRUN_TOOLCHAIN}" lipo)
   endif()
 endif()
 
@@ -581,18 +585,6 @@ endif()
 # Configure SDKs.
 #
 
-function(is_sdk_requested name result_var_name)
-  if("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${name}")
-    set("${result_var_name}" "TRUE" PARENT_SCOPE)
-  else()
-    if("${name}" IN_LIST SWIFT_SDKS)
-      set("${result_var_name}" "TRUE" PARENT_SCOPE)
-    else()
-      set("${result_var_name}" "FALSE" PARENT_SCOPE)
-    endif()
-  endif()
-endfunction()
-
 if(XCODE)
   # FIXME: Cannot cross-compile the standard library using Xcode.  Xcode
   # insists on passing -mmacosx-version-min to the compiler, and we need
@@ -693,84 +685,7 @@ elseif("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*)")
   message(STATUS "${xcode_version}")
   message(STATUS "")
 
-  is_sdk_requested(OSX swift_build_osx)
-  if(swift_build_osx)
-    configure_sdk_darwin(
-        OSX "OS X" "${SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX}"
-        macosx macosx macosx "x86_64")
-    configure_target_variant(OSX-DA "OS X Debug+Asserts"   OSX DA "Debug+Asserts")
-    configure_target_variant(OSX-RA "OS X Release+Asserts" OSX RA "Release+Asserts")
-    configure_target_variant(OSX-R  "OS X Release"         OSX R  "Release")
-  endif()
-
-  # Compatible cross-compile SDKS for Darwin OSes: IOS, IOS_SIMULATOR, TVOS,
-  #   TVOS_SIMULATOR, WATCHOS, WATCHOS_SIMULATOR (archs hardcoded below).
-
-  is_sdk_requested(IOS swift_build_ios)
-  if(swift_build_ios)
-    configure_sdk_darwin(
-        IOS "iOS" "${SWIFT_DARWIN_DEPLOYMENT_VERSION_IOS}"
-        iphoneos ios ios "armv7;armv7s;arm64")
-    configure_target_variant(IOS-DA "iOS Debug+Asserts"   IOS DA "Debug+Asserts")
-    configure_target_variant(IOS-RA "iOS Release+Asserts" IOS RA "Release+Asserts")
-    configure_target_variant(IOS-R  "iOS Release"         IOS R "Release")
-  endif()
-
-  is_sdk_requested(IOS_SIMULATOR swift_build_ios_simulator)
-  if(swift_build_ios_simulator)
-    configure_sdk_darwin(
-        IOS_SIMULATOR "iOS Simulator" "${SWIFT_DARWIN_DEPLOYMENT_VERSION_IOS}"
-        iphonesimulator ios-simulator ios "i386;x86_64")
-    configure_target_variant(
-        IOS_SIMULATOR-DA "iOS Debug+Asserts"   IOS_SIMULATOR DA "Debug+Asserts")
-    configure_target_variant(
-        IOS_SIMULATOR-RA "iOS Release+Asserts" IOS_SIMULATOR RA "Release+Asserts")
-    configure_target_variant(
-        IOS_SIMULATOR-R  "iOS Release"         IOS_SIMULATOR R "Release")
-  endif()
-
-  is_sdk_requested(TVOS swift_build_tvos)
-  if(swift_build_tvos)
-    configure_sdk_darwin(
-        TVOS "tvOS" "${SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS}"
-        appletvos tvos tvos "arm64")
-    configure_target_variant(TVOS-DA "tvOS Debug+Asserts"   TVOS DA "Debug+Asserts")
-    configure_target_variant(TVOS-RA "tvOS Release+Asserts" TVOS RA "Release+Asserts")
-    configure_target_variant(TVOS-R  "tvOS Release"         TVOS R "Release")
-  endif()
-
-  is_sdk_requested(TVOS_SIMULATOR swift_build_tvos_simulator)
-  if(swift_build_tvos_simulator)
-    configure_sdk_darwin(
-        TVOS_SIMULATOR "tvOS Simulator" "${SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS}"
-        appletvsimulator tvos-simulator tvos "x86_64")
-    configure_target_variant(
-      TVOS_SIMULATOR-DA "tvOS Debug+Asserts"   TVOS_SIMULATOR DA "Debug+Asserts")
-    configure_target_variant(
-      TVOS_SIMULATOR-RA "tvOS Release+Asserts" TVOS_SIMULATOR RA "Release+Asserts")
-    configure_target_variant(
-      TVOS_SIMULATOR-R  "tvOS Release"         TVOS_SIMULATOR R "Release")
-  endif()
-
-  is_sdk_requested(WATCHOS swift_build_watchos)
-  if(swift_build_watchos)
-    configure_sdk_darwin(
-        WATCHOS "watchOS" "${SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS}"
-        watchos watchos watchos "armv7k")
-    configure_target_variant(WATCHOS-DA "watchOS Debug+Asserts"   WATCHOS DA "Debug+Asserts")
-    configure_target_variant(WATCHOS-RA "watchOS Release+Asserts" WATCHOS RA "Release+Asserts")
-    configure_target_variant(WATCHOS-R  "watchOS Release"         WATCHOS R "Release")
-  endif()
-
-  is_sdk_requested(WATCHOS_SIMULATOR swift_build_watchos_simulator)
-  if(swift_build_watchos_simulator)
-    configure_sdk_darwin(
-        WATCHOS_SIMULATOR "watchOS Simulator" "${SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS}"
-        watchsimulator watchos-simulator watchos "i386")
-    configure_target_variant(WATCHOS_SIMULATOR-DA "watchOS Debug+Asserts"   WATCHOS_SIMULATOR DA "Debug+Asserts")
-    configure_target_variant(WATCHOS_SIMULATOR-RA "watchOS Release+Asserts" WATCHOS_SIMULATOR RA "Release+Asserts")
-    configure_target_variant(WATCHOS_SIMULATOR-R  "watchOS Release"         WATCHOS_SIMULATOR R "Release")
-  endif()
+  include(DarwinSDKs)
 
   # FIXME: guess target variant based on the host.
   # if(SWIFT_HOST_VARIANT MATCHES "^macosx")
@@ -800,6 +715,21 @@ endif()
 # Should we cross-compile the standard library for Android?
 is_sdk_requested(ANDROID swift_build_android)
 if(swift_build_android AND NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
+  # Get the prebuilt suffix to create the correct toolchain path when using the NDK
+  if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+    set(_swift_android_prebuilt_suffix "darwin-x86_64")
+  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+    set(_swift_android_prebuilt_suffix "linux-x86_64")
+  endif()
+
+  set(SWIFT_ANDROID_PREBUILT_PATH
+      "${SWIFT_ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${_swift_android_prebuilt_suffix}")
+  
+  # Resolve the correct linker based on the file name of CMAKE_LINKER (being 'ld' or 'ld.gold' the options)
+  get_filename_component(SWIFT_ANDROID_LINKER_NAME "${CMAKE_LINKER}" NAME)
+  set(SWIFT_SDK_ANDROID_ARCH_armv7_LINKER 
+      "${SWIFT_ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${_swift_android_prebuilt_suffix}/bin/arm-linux-androideabi-${SWIFT_ANDROID_LINKER_NAME}")
+
   configure_sdk_unix(ANDROID "Android" "android" "android" "armv7" "armv7-none-linux-androideabi" "${SWIFT_ANDROID_SDK_PATH}")
 
   if (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux"))
@@ -809,14 +739,6 @@ if(swift_build_android AND NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
     set(SWIFT_PRIMARY_VARIANT_SDK_default "ANDROID")
     set(SWIFT_PRIMARY_VARIANT_ARCH_default "armv7")
   endif()
-
-  if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-    set(_swift_android_prebuilt_suffix "darwin-x86_64")
-  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-    set(_swift_android_prebuilt_suffix "linux-x86_64")
-  endif()
-  set(SWIFT_ANDROID_PREBUILT_PATH
-      "${SWIFT_ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${_swift_android_prebuilt_suffix}")
 endif()
 
 # Should we cross-compile the standard library for Windows?

README.md

@@ -1,8 +1,9 @@
 <img src="https://swift.org/assets/images/swift.svg" alt="Swift logo" height="70" >
+
 # Swift Programming Language
 
-|| **Swift** | **Package** |
-|---|---|---|
+| | **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)|
 |**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)|
@@ -53,7 +54,7 @@ discussed below.
 macOS, Ubuntu Linux LTS, and the latest Ubuntu Linux release are the current
 supported host development operating systems.
 
-For macOS, you need [Xcode 8.3 Beta 3](https://developer.apple.com/xcode/downloads/).
+For macOS, you need [Xcode 8.3 Beta 4](https://developer.apple.com/xcode/downloads/).
 
 For Ubuntu, you'll need the following development dependencies:
 

benchmark/CMakeLists.txt

@@ -29,20 +29,22 @@ set(SWIFT_BENCH_MODULES
     single-source/ArraySubscript
     single-source/BitCount
     single-source/ByteSwap
+    single-source/CString
     single-source/Calculator
     single-source/CaptureProp
     single-source/CharacterLiteralsLarge
     single-source/CharacterLiteralsSmall
     single-source/Chars
     single-source/ClassArrayGetter
     single-source/DeadArray
-    single-source/DictTest
-    single-source/DictTest2
-    single-source/DictTest3
     single-source/DictionaryBridge
     single-source/DictionaryLiteral
     single-source/DictionaryRemove
     single-source/DictionarySwap
+    single-source/DictTest
+    single-source/DictTest2
+    single-source/DictTest3
+    single-source/DropLast
     single-source/ErrorHandling
     single-source/Fibonacci
     single-source/GlobalClass
@@ -53,15 +55,16 @@ set(SWIFT_BENCH_MODULES
     single-source/Integrate
     single-source/IterateData
     single-source/Join
+    single-source/LazyFilter
     single-source/LinkedList
     single-source/MapReduce
     single-source/Memset
     single-source/MonteCarloE
     single-source/MonteCarloPi
+    single-source/NopDeinit
     single-source/NSDictionaryCastToSwift
     single-source/NSError
     single-source/NSStringConversion
-    single-source/NopDeinit
     single-source/ObjectAllocation
     single-source/ObjectiveCBridging
     single-source/ObjectiveCBridgingStubs
@@ -78,11 +81,11 @@ set(SWIFT_BENCH_MODULES
     single-source/Prims
     single-source/ProtocolDispatch
     single-source/ProtocolDispatch2
-    single-source/RC4
-    single-source/RGBHistogram
     single-source/RangeAssignment
+    single-source/RC4
     single-source/RecursiveOwnedParameter
     single-source/ReversedCollections
+    single-source/RGBHistogram
     single-source/SetTests
     single-source/SevenBoom
     single-source/Sim2DArray
@@ -91,11 +94,14 @@ set(SWIFT_BENCH_MODULES
     single-source/StackPromo
     single-source/StaticArray
     single-source/StrComplexWalk
-    single-source/StrToInt
     single-source/StringBuilder
+    single-source/StringEdits
     single-source/StringInterpolation
+    single-source/StringMatch
     single-source/StringTests
     single-source/StringWalk
+    single-source/StrToInt
+    single-source/Suffix
     single-source/SuperChars
     single-source/TwoSum
     single-source/TypeFlood
@@ -141,7 +147,7 @@ if(NOT SWIFT_LIBRARY_PATH)
 endif()
 
 # If the CMAKE_C_COMPILER is already clang, don't find it again,
-# thus allowing the --host-cc build-script argument to work here.
+# thus allowing the --cmake-c-compiler build-script argument to work here.
 get_filename_component(c_compiler ${CMAKE_C_COMPILER} NAME)
 
 if(${c_compiler} STREQUAL "clang")

benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

@@ -321,6 +321,7 @@ function (swift_benchmark_compile_archopts)
         "-c"
         "-o" "${objcfile}")
 
+  precondition(CMAKE_CODESIGN MESSAGE "CMAKE_CODESIGN is required, please set it")
   add_custom_command(
       OUTPUT "${OUTPUT_EXEC}"
       DEPENDS
@@ -349,7 +350,7 @@ function (swift_benchmark_compile_archopts)
         ${objcfile}
         "-o" "${OUTPUT_EXEC}"
       COMMAND
-        "codesign" "-f" "-s" "-" "${OUTPUT_EXEC}")
+        ${CMAKE_CODESIGN} "-f" "-s" "-" "${OUTPUT_EXEC}")
   set(new_output_exec "${OUTPUT_EXEC}" PARENT_SCOPE)
 endfunction()
 

benchmark/scripts/generate_harness/CMakeLists.txt_template

@@ -68,7 +68,7 @@ if(NOT SWIFT_LIBRARY_PATH)
 endif()
 
 # If the CMAKE_C_COMPILER is already clang, don't find it again,
-# thus allowing the --host-cc build-script argument to work here.
+# thus allowing the --cmake-c-compiler build-script argument to work here.
 get_filename_component(c_compiler ${CMAKE_C_COMPILER} NAME)
 
 if(${c_compiler} STREQUAL "clang")

benchmark/single-source/CString.swift

@@ -0,0 +1,89 @@
+//===--- CString.swift -------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import TestsUtils
+#if os(Linux)
+import Glibc
+#else
+import Darwin
+#endif
+
+let ascii = "Swift is a multi-paradigm, compiled programming language created for iOS, OS X, watchOS, tvOS and Linux development by Apple Inc. Swift is designed to work with Apple's Cocoa and Cocoa Touch frameworks and the large body of existing Objective-C code written for Apple products. Swift is intended to be more resilient to erroneous code (\"safer\") than Objective-C and also more concise. It is built with the LLVM compiler framework included in Xcode 6 and later and uses the Objective-C runtime, which allows C, Objective-C, C++ and Swift code to run within a single program."
+let japanese = "日本語（にほんご、にっぽんご）は、主に日本国内や日本人同士の間で使われている言語である。"
+
+@inline(never)
+public func run_StringWithCString(_ N: Int) {
+  let str = String(repeating: "x", count: 100 * (1 << 16))
+  for _ in 0 ..< N {
+    str.withCString { _ in }
+  }
+}
+
+@inline(never)
+public func run_CStringLongAscii(_ N: Int) {
+  let refResult = 517492
+  var res: UInt = 0
+  for _ in 1...N*500 {
+    // static string to c -> from c to String -> implicit conversion
+    res &= strlen(ascii.withCString(String.init(cString:)))
+  }
+  CheckResults(res == 0, "IncorrectResults in run_CStringLongAscii: \(res) != \(refResult)")
+}
+
+@inline(never)
+public func run_CStringLongNonAscii(_ N: Int) {
+  let refResult = 517492
+  var res: UInt = 0
+  for _ in 1...N*500 {
+    res &= strlen(japanese.withCString(String.init(cString:)))
+  }
+  CheckResults(res == 0, "IncorrectResults in run_CStringLongAscii: \(res) != \(refResult)")
+}
+
+
+let input = ["-237392", "293715", "126809", "333779", "-362824", "144198",
+             "-394973", "-163669", "-7236", "376965", "-400783", "-118670",
+             "454728", "-38915", "136285", "-448481", "-499684", "68298",
+             "382671", "105432", "-38385", "39422", "-267849", "-439886",
+             "292690", "87017", "404692", "27692", "486408", "336482",
+             "-67850", "56414", "-340902", "-391782", "414778", "-494338",
+             "-413017", "-377452", "-300681", "170194", "428941", "-291665",
+             "89331", "329496", "-364449", "272843", "-10688", "142542",
+             "-417439", "167337", "96598", "-264104", "-186029", "98480",
+             "-316727", "483808", "300149", "-405877", "-98938", "283685",
+             "-247856", "-46975", "346060", "160085",]
+let reference = 517492
+
+@inline(never)
+public func run_CStringShortAscii(_ N: Int) {
+  
+  func DoOneIter(_ arr: [String]) -> Int {
+    var r = 0
+    for n in arr {
+      r += Int(atoi(n))
+    }
+    if r < 0 {
+      r = -r
+    }
+    return r
+  }
+
+  var res = Int.max
+  for _ in 1...100*N {
+    let strings = input.map { 
+      $0.withCString(String.init(cString:))
+    }
+    res = res & DoOneIter(strings)
+  }
+  assert(res == reference, "IncorrectResults in StrToInt: \(res) != \(reference)")
+}
+