Merge branch 'master' into warn-on-empty-optionset-static-constants

Author: Vercantez

CMakeLists.txt

@@ -20,7 +20,7 @@ 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})
+  set_property(GLOBAL APPEND PROPERTY JOB_POOLS local_jobs=${localhost_logical_cores})
   # Put linking in that category
   set(CMAKE_JOB_POOL_LINK local_jobs)
 endif()
@@ -1096,12 +1096,6 @@ endif()
 # declares the swift-stdlib-* set of targets. These targets will then
 # implicitly depend on any targets declared with IS_STDLIB.
 #
-# One such library that declares IS_STDLIB is SwiftSyntax, living in
-# tools/SwiftSyntax. If we include stdlib/ after tools/,
-# the swift-stdlib-* set of targets will not have been generated yet,
-# causing the implicit dependency for SwiftSyntax to silently not be
-# created. This then will cause SwiftSyntax to fail to build.
-#
 # https://bugs.swift.org/browse/SR-5975
 if(SWIFT_BUILD_STDLIB)
   add_subdirectory(stdlib)
@@ -1126,7 +1120,7 @@ add_subdirectory(include)
 
 if(SWIFT_INCLUDE_TOOLS)
   add_subdirectory(lib)
-  
+
   # Always include this after including stdlib/!
   # Refer to the large comment above the add_subdirectory(stdlib) call.
   # https://bugs.swift.org/browse/SR-5975

benchmark/CMakeLists.txt

@@ -51,6 +51,7 @@ set(SWIFT_BENCH_MODULES
     single-source/CSVParsing
     single-source/Calculator
     single-source/CaptureProp
+    single-source/ChaCha
     single-source/ChainedFilterMap
     single-source/CharacterLiteralsLarge
     single-source/CharacterLiteralsSmall

benchmark/scripts/test_Benchmark_Driver.py

@@ -17,7 +17,6 @@
 import os
 import time
 import unittest
-
 from StringIO import StringIO
 from imp import load_source
 

benchmark/scripts/test_utils.py

@@ -24,7 +24,6 @@
 
 import logging
 import sys
-
 from StringIO import StringIO
 from contextlib import contextmanager