Merge remote-tracking branch 'origin/master' into master-next

Author: bob-wilson

.dir-locals.el

@@ -10,28 +10,19 @@
 ;
 ;===----------------------------------------------------------------------===;
 ;;; Directory Local Variables
-;;; See Info node `(emacs) Directory Variables' for more information.
+;;; For more information see (info "(emacs) Directory Variables")
 
 ((nil
   (tab-width . 2)
   (fill-column . 80)
-  (eval .
-        ;; Load the Swift project's settings.  To suppress this action
-        ;; you can put "(provide 'swift-project-settings)" in your
-        ;; .emacs
+  (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)
-          ;; Make sure the project's own utils directory is in the
-          ;; load path, but don't override any one the user might have
-          ;; set up.
-          (add-to-list
-           'load-path
-           (concat
-            (let ((dlff (dir-locals-find-file default-directory)))
-              (if (listp dlff) (car dlff) (file-name-directory dlff)))
-            "utils")
-           :append)
-            ;; Load our project's settings -- indirectly brings in swift-mode
+          (add-to-list 'load-path  (concat this-directory "utils") :append)
+          (let ((swift-project-directory this-directory))
           (require 'swift-project-settings)))
+        (set (make-local-variable 'swift-project-directory) this-directory))
   (c-file-style . "swift")
   )
  (c++-mode
@@ -44,6 +35,8 @@
   (whitespace-style . (face lines indentation:space))
   (eval . (whitespace-mode)))
  (swift-mode
+  (swift-find-executable-fn . swift-project-executable-find)
+  (swift-syntax-check-fn . swift-project-swift-syntax-check)
   (whitespace-style . (face lines indentation:space))
   (eval . (whitespace-mode))
   (swift-basic-offset . 2)

.pep8

@@ -1,2 +1,2 @@
 [flake8]
-filename = *.py,80+-check,Benchmark_Driver,Benchmark_DTrace.in,Benchmark_GuardMalloc.in,Benchmark_RuntimeLeaksRunner.in,build-script,check-incremental,gyb,line-directive,mock-distcc,ns-html2rst,recursive-lipo,rth,run-test,submit-benchmark-results,update-checkout,viewcfg,backtrace-check
+filename = *.py,80+-check,backtrace-check,Benchmark_Driver,Benchmark_DTrace.in,Benchmark_GuardMalloc.in,Benchmark_RuntimeLeaksRunner.in,build-script,check-incremental,clang++,coverage-build-db,coverage-generate-data,coverage-query-db,coverage-touch-tests,gyb,ld,line-directive,mock-distcc,ns-html2rst,PathSanitizingFileCheck,recursive-lipo,rth,run-test,submit-benchmark-results,update-checkout,viewcfg,symbolicate-linux-fatal

CHANGELOG.md

@@ -8,6 +8,12 @@ if(POLICY CMP0054)
   cmake_policy(SET CMP0054 NEW)
 endif()
 
+# Enable the IN_LIST operator, as in:
+# `if(<element_variable> IN_LIST <list_variable>)`
+if(POLICY CMP0057)
+  cmake_policy(SET CMP0057 NEW)
+endif()
+
 # Add path for custom CMake modules.
 list(APPEND CMAKE_MODULE_PATH
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
@@ -269,6 +275,10 @@ option(SWIFT_STDLIB_ENABLE_RESILIENCE
     "Build the standard libraries and overlays with resilience enabled; see docs/LibraryEvolution.rst"
     FALSE)
 
+option(SWIFT_STDLIB_ENABLE_SIL_OWNERSHIP
+  "Build the standard libraries and overlays with sil ownership enabled."
+  FALSE)
+
 option(SWIFT_STDLIB_SIL_SERIALIZE_ALL
     "Build the standard libraries and overlays serializing all method bodies"
     TRUE)
@@ -413,6 +423,12 @@ include_directories(BEFORE
 #  endif()
 set(SWIFT_DARWIN_VARIANTS "^(macosx|iphoneos|iphonesimulator|appletvos|appletvsimulator|watchos|watchsimulator)")
 
+# A convenient list to match Darwin SDKs. Example:
+#  if("${SWIFT_HOST_VARIANT_SDK}" IN_LIST SWIFT_APPLE_PLATFORMS)
+#    ...
+#  endif()
+set(SWIFT_APPLE_PLATFORMS "IOS" "IOS_SIMULATOR" "TVOS" "TVOS_SIMULATOR" "WATCHOS" "WATCHOS_SIMULATOR" "OSX")
+
 # Configuration flags passed to all of our invocations of gyb.  Try to
 # avoid making up new variable names here if you can find a CMake
 # variable that will do the job.
@@ -491,11 +507,10 @@ function(is_sdk_requested name result_var_name)
   if("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${name}")
     set("${result_var_name}" "TRUE" PARENT_SCOPE)
   else()
-    list(FIND SWIFT_SDKS "${name}" sdk_index)
-    if(${sdk_index} EQUAL -1)
-      set("${result_var_name}" "FALSE" 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()

CMakeLists.txt

@@ -6,6 +6,7 @@
 |**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 15.10** |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-15_10/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-15_10)|[![Build Status](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-15_10/badge/icon)](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-15_10)|
+|**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)|
 
 **Welcome to Swift!**
 

README.md

@@ -35,7 +35,6 @@ set(SWIFT_API_NOTES_INPUTS
   ObjectiveC
   PassKit
   Photos
-  QuartzCore
   QuickLook
   SafariServices
   SceneKit
@@ -67,8 +66,7 @@ endforeach()
 file(GLOB SWIFT_API_NOTES_INPUT_FILES "${SWIFT_API_NOTES_PATH}/*.apinotes")
 foreach(file ${SWIFT_API_NOTES_INPUT_FILES})
   get_filename_component(name "${file}" NAME_WE)
-  list(FIND SWIFT_API_NOTES_INPUTS "${name}" name_index)
-  if(name_index EQUAL -1)
+  if(NOT "${name}" IN_LIST SWIFT_API_NOTES_INPUTS)
     message(SEND_ERROR "Found apinotes for ${name}; please add to CMakeLists.txt")
   endif()
 endforeach()

apinotes/CMakeLists.txt

@@ -2,11 +2,11 @@
 Name: Metal
 Tags:
 - Name: MTLCommandBufferError
-  SwiftName: MTLCommandBufferErrorDomain
+  NSErrorDomain: MTLCommandBufferErrorDomain
 - Name: MTLLibraryError
-  SwiftName: MTLLibraryErrorDomain
+  NSErrorDomain: MTLLibraryErrorDomain
 - Name: MTLRenderPipelineError
-  SwiftName: MTLRenderPipelineErrorDomain
+  NSErrorDomain: MTLRenderPipelineErrorDomain
 Enumerators:
 - Name: MTLResourceStorageModeShared
   SwiftName: storageModeShared

apinotes/Metal.apinotes

@@ -2,10 +2,10 @@
 Name: NetworkExtension
 Tags:
 - Name: NEAppProxyFlowError
-  SwiftName: NEAppProxyErrorDomain
+  NSErrorDomain: NEAppProxyErrorDomain
 - Name: NEFilterError
-  SwiftName: NEFilterErrorDomain
+  NSErrorDomain: NEFilterErrorDomain
 - Name: NETunnelProviderError
-  SwiftName: NETunnelProviderErrorDomain
+  NSErrorDomain: NETunnelProviderErrorDomain
 - Name: NEVPNError
-  SwiftName: NEVPNErrorDomain
+  NSErrorDomain: NEVPNErrorDomain

apinotes/NetworkExtension.apinotes

@@ -101,7 +101,7 @@ Protocols:
   - Selector: class
     MethodKind: Instance
     Availability: nonswift
-    AvailabilityMsg: use 'dynamicType' instead
+    AvailabilityMsg: use 'type(of:)' instead
   - Selector: 'conformsToProtocol:'
     MethodKind: Instance
     Nullability:

apinotes/ObjectiveC.apinotes

@@ -2,6 +2,6 @@
 Name: SafariServices
 Tags:
 - Name: SFErrorCode
-  SwiftName: SFErrorDomain
+  NSErrorDomain: SFErrorDomain
 - Name: SSReadingListErrorCode
-  SwiftName: SSReadingListErrorDomain
+  NSErrorDomain: SSReadingListErrorDomain

apinotes/QuartzCore.apinotes

@@ -38,13 +38,13 @@ set(SWIFT_BENCH_MODULES
     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/ErrorHandling
     single-source/Fibonacci
     single-source/GlobalClass
@@ -59,10 +59,10 @@ set(SWIFT_BENCH_MODULES
     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/OpenClose
     single-source/Phonebook
@@ -72,22 +72,22 @@ set(SWIFT_BENCH_MODULES
     single-source/Prims
     single-source/ProtocolDispatch
     single-source/ProtocolDispatch2
-    single-source/RangeAssignment
     single-source/RC4
-    single-source/RecursiveOwnedParameter
     single-source/RGBHistogram
+    single-source/RangeAssignment
+    single-source/RecursiveOwnedParameter
     single-source/SetTests
     single-source/SevenBoom
     single-source/Sim2DArray
     single-source/SortLettersInPlace
     single-source/SortStrings
     single-source/StaticArray
     single-source/StrComplexWalk
+    single-source/StrToInt
     single-source/StringBuilder
     single-source/StringInterpolation
     single-source/StringTests
     single-source/StringWalk
-    single-source/StrToInt
     single-source/SuperChars
     single-source/TwoSum
     single-source/TypeFlood
@@ -139,7 +139,8 @@ runcmd(COMMAND "xcrun" "-toolchain" "${SWIFT_DARWIN_XCRUN_TOOLCHAIN}" "-f" "clan
 # You have to delete CMakeCache.txt in the swift build to force a
 # reconfiguration.
 set(SWIFT_EXTRA_BENCH_CONFIGS CACHE STRING
-    "A semicolon separated list of benchmark configurations. Available configurations: <Optlevel>_SINGLEFILE, <Optlevel>_MULTITHREADED")
+    "A semicolon separated list of benchmark configurations. \
+Available configurations: <Optlevel>_SINGLEFILE, <Optlevel>_MULTITHREADED")
 
 # Syntax for an optset:  <optimization-level>_<configuration>
 #    where "_<configuration>" is optional.
@@ -148,6 +149,11 @@ if(NOT SWIFT_OPTIMIZATION_LEVELS)
                                 ${SWIFT_EXTRA_BENCH_CONFIGS})
 endif()
 
+set(SWIFT_BENCHMARK_NUM_O_ITERATIONS "" CACHE STRING
+    "Number of iterations to perform when running -O benchmarks via cmake")
+set(SWIFT_BENCHMARK_NUM_ONONE_ITERATIONS "" CACHE STRING
+    "Number of iterations to perform when running -Onone benchmarks via cmake")
+
 # Options for the default (= empty) configuration
 set(BENCHOPTS "-whole-module-optimization")
 

apinotes/SafariServices.apinotes

@@ -382,11 +382,11 @@ function(swift_benchmark_compile)
           COMMAND "${swift-bin-dir}/Benchmark_Driver" "run"
                   "-o" "O" "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}/logs"
                   "--swift-repo" "${SWIFT_SOURCE_DIR}"
-                  "--iterations" "3"
+                  "--iterations" "${SWIFT_BENCHMARK_NUM_O_ITERATIONS}"
           COMMAND "${swift-bin-dir}/Benchmark_Driver" "run"
                   "-o" "Onone" "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}/logs"
                   "--swift-repo" "${SWIFT_SOURCE_DIR}"
-                  "--iterations" "3"
+                  "--iterations" "${SWIFT_BENCHMARK_NUM_ONONE_ITERATIONS}"
           COMMAND "${swift-bin-dir}/Benchmark_Driver" "compare"
                   "--log-dir" "${CMAKE_CURRENT_BINARY_DIR}/logs"
                   "--swift-repo" "${SWIFT_SOURCE_DIR}"

benchmark/CMakeLists.txt

@@ -71,6 +71,9 @@
 PAIN_DETAIL = """
 {0}: {1}"""
 
+RATIO_MIN = None
+RATIO_MAX = None
+
 
 def main():
     global RATIO_MIN
@@ -146,11 +149,11 @@ def main():
 
     ratio_total = 0
     for key in new_results.keys():
-            ratio = (old_results[key]+0.001)/(new_results[key]+0.001)
+            ratio = (old_results[key] + 0.001) / (new_results[key] + 0.001)
             ratio_list[key] = round(ratio, 2)
             ratio_total *= ratio
-            delta = (((float(new_results[key]+0.001) /
-                      (old_results[key]+0.001)) - 1) * 100)
+            delta = (((float(new_results[key] + 0.001) /
+                      (old_results[key] + 0.001)) - 1) * 100)
             delta_list[key] = round(delta, 2)
             if ((old_results[key] < new_results[key] and
                 new_results[key] < old_max_results[key]) or
@@ -174,17 +177,17 @@ def main():
     delta_width = max_width(delta_list, title='DELTA (%)')
 
     markdown_table_header = "\n" + MARKDOWN_ROW.format(
-                                        "TEST".ljust(test_name_width),
-                                        old_branch.ljust(old_time_width),
-                                        new_branch.ljust(new_time_width),
-                                        "DELTA (%)".ljust(delta_width),
-                                        "SPEEDUP".ljust(2))
+        "TEST".ljust(test_name_width),
+        old_branch.ljust(old_time_width),
+        new_branch.ljust(new_time_width),
+        "DELTA (%)".ljust(delta_width),
+        "SPEEDUP".ljust(2))
     markdown_table_header += MARKDOWN_ROW.format(
-                                         HEADER_SPLIT.ljust(test_name_width),
-                                         HEADER_SPLIT.ljust(old_time_width),
-                                         HEADER_SPLIT.ljust(new_time_width),
-                                         HEADER_SPLIT.ljust(delta_width),
-                                         HEADER_SPLIT.ljust(2))
+        HEADER_SPLIT.ljust(test_name_width),
+        HEADER_SPLIT.ljust(old_time_width),
+        HEADER_SPLIT.ljust(new_time_width),
+        HEADER_SPLIT.ljust(delta_width),
+        HEADER_SPLIT.ljust(2))
     markdown_regression = ""
     for i, key in enumerate(decreased_perf_list):
         ratio = "{0:.2f}x".format(ratio_list[key])

benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

@@ -37,8 +37,8 @@
 
 if __name__ == '__main__':
     # CMakeList single-source
-    tests = [os.path.basename(x).split('.')[0]
-             for x in glob.glob(os.path.join(single_source_dir, '*.swift'))]
+    test_files = glob.glob(os.path.join(single_source_dir, '*.swift'))
+    tests = sorted(os.path.basename(x).split('.')[0] for x in test_files)
 
     # CMakeList multi-source
     class MultiSourceBench(object):

benchmark/scripts/compare_perf_tests.py

@@ -18,7 +18,7 @@ public func run_Dictionary2(_ N: Int) {
   let ref_result = 199
   var res = 0
   for _ in 1...5*N {
-    var x: [String:Int] = [:]
+    var x: [String: Int] = [:]
     for i in 1...size {
       x[String(i, radix:16)] = i
     }

benchmark/scripts/generate_harness/generate_harness.py

@@ -17,8 +17,8 @@ public func run_Dictionary3(_ N: Int) {
   let size1 = 100
   let reps = 20
   let ref_result = "1 99 20 1980"
-  var hash1 = [String:Int]()
-  var hash2 = [String:Int]()
+  var hash1 = [String: Int]()
+  var hash2 = [String: Int]()
   var res = ""
 
   for _ in 1...N {

benchmark/single-source/DictTest2.swift

@@ -14,7 +14,7 @@
 // rdar://problem/18539730
 //
 // Description:
-//     Create a NSDictionary instance and cast it to [String: NSObject].
+//     Create an NSDictionary instance and cast it to [String: NSObject].
 import Foundation
 import TestsUtils
 

benchmark/single-source/DictTest3.swift

@@ -96,7 +96,7 @@ struct TestConfig {
 
   /// After we run the tests, should the harness sleep to allow for utilities
   /// like leaks that require a PID to run on the test harness.
-  var afterRunSleep: Int? = nil
+  var afterRunSleep: Int?
 
   /// The list of tests to run.
   var tests = [Test]()