Merge branch 'master' into nc-dwformatting

Author: natecook1000

CMakeLists.txt

@@ -783,7 +783,7 @@ if(SWIFT_PARALLEL_LINK_JOBS)
 endif()
 
 # Set the CMAKE_OSX_* variables in a way that minimizes conflicts.
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" AND NOT CMAKE_CROSSCOMPILING)
   set(CMAKE_OSX_SYSROOT "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_PATH}")
   set(CMAKE_OSX_ARCHITECTURES "")
   set(CMAKE_OSX_DEPLOYMENT_TARGET "")

README.md

@@ -55,7 +55,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 9.0 beta 2](https://developer.apple.com/xcode/downloads/).
+For macOS, you need [Xcode 9.0 beta 4](https://developer.apple.com/xcode/downloads/).
 
 <a name="linux-dependencies"></a>For Ubuntu, you'll need the following
 development dependencies:

benchmark/single-source/CString.swift

@@ -30,7 +30,6 @@ public func run_StringWithCString(_ N: Int) {
 
 @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
@@ -41,7 +40,6 @@ public func run_CStringLongAscii(_ N: Int) {
 
 @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:)))

benchmark/single-source/DictionarySwap.swift

@@ -27,7 +27,7 @@ public func run_DictionarySwap(_ N: Int) {
 
     var swapped = false
     for _ in 1...10000*N {
-        swap(&dict[25]!, &dict[75]!)
+        (dict[25], dict[75]) = (dict[75]!, dict[25]!)
         swapped = !swapped
         if !swappedCorrectly(swapped, dict[25]!, dict[75]!) {
             break
@@ -72,7 +72,9 @@ public func run_DictionarySwapOfObjects(_ N: Int) {
 
     var swapped = false
     for _ in 1...10000*N {
-        swap(&dict[Box(25)]!, &dict[Box(75)]!)
+        let b1 = Box(25)
+        let b2 = Box(75)
+        (dict[b1], dict[b2]) = (dict[b2]!, dict[b1]!)
         swapped = !swapped
         if !swappedCorrectly(swapped, dict[Box(25)]!.value, dict[Box(75)]!.value) {
             break

benchmark/single-source/ExistentialPerformance.swift

@@ -326,7 +326,7 @@ func runTestArrayShift<T: Existential>(withType: T.Type, numberOfTimes N: Int) {
   for _ in 0 ..< N {
     for _ in 0 ..< 5_000 {
       for i in 0 ..< existentialArray.count-1 {
-        swap(&existentialArray[i], &existentialArray[i+1])
+        existentialArray.swapAt(i, i+1)
       }
     }
   }

cmake/modules/AddSwift.cmake

@@ -1553,9 +1553,17 @@ function(add_swift_library name)
         endif()
 
         # Add PrivateFrameworks, rdar://28466433
+        set(swiftlib_link_flags_all ${SWIFTLIB_LINK_FLAGS})
         if(SWIFTLIB_IS_SDK_OVERLAY)
           list(APPEND swiftlib_swift_compile_flags_all "-Fsystem" "${SWIFT_SDK_${sdk}_PATH}/System/Library/PrivateFrameworks/")
         endif()
+       
+       if("${sdk}" STREQUAL "IOS_SIMULATOR")
+         if("${name}" STREQUAL "swiftMediaPlayer")
+           message("DISABLING AUTOLINK FOR swiftMediaPlayer")
+           list(APPEND swiftlib_link_flags_all "-Xlinker" "-ignore_auto_link")
+         endif()
+       endif()
 
         # Add this library variant.
         _add_swift_library_single(
@@ -1576,7 +1584,7 @@ function(add_swift_library name)
           FILE_DEPENDS ${SWIFTLIB_FILE_DEPENDS} ${swiftlib_module_dependency_targets}
           C_COMPILE_FLAGS ${SWIFTLIB_C_COMPILE_FLAGS}
           SWIFT_COMPILE_FLAGS ${swiftlib_swift_compile_flags_all}
-          LINK_FLAGS ${SWIFTLIB_LINK_FLAGS}
+          LINK_FLAGS ${swiftlib_link_flags_all}
           PRIVATE_LINK_LIBRARIES ${swiftlib_private_link_libraries_targets}
           INCORPORATE_OBJECT_LIBRARIES ${SWIFTLIB_INCORPORATE_OBJECT_LIBRARIES}
           INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY ${SWIFTLIB_INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY}

cmake/modules/AddSwiftTableGen.cmake

@@ -3,7 +3,7 @@ include(TableGen)
 # This needs to be a macro since tablegen (which is a function) needs to set
 # variables in its parent scope.
 macro(swift_tablegen)
-  tablegen(SWIFT ${ARGN})
+  tablegen(LLVM ${ARGN})
 endmacro()
 
 # This needs to be a macro since add_public_tablegen_target (which is a

cmake/modules/SwiftHandleGybSources.cmake

@@ -118,7 +118,20 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
       "${SWIFT_SOURCE_DIR}/utils/UnicodeData/GraphemeBreakTest.txt"
       "${SWIFT_SOURCE_DIR}/utils/gyb_stdlib_support.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_stdlib_unittest_support.py"
-  )
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/__init__.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/Child.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/kinds.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/Node.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/AttributeNodes.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/CommonNodes.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/DeclNodes.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/ExprNodes.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/GenericNodes.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/PatternNodes.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/StmtNodes.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/TypeNodes.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/Token.py")
+
   foreach (src ${${sources_var_name}})
     string(REGEX REPLACE "[.]gyb$" "" src_sans_gyb "${src}")
     if(src STREQUAL src_sans_gyb)
@@ -153,3 +166,16 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
   set("${dependency_out_var_name}" "${dependency_targets}" PARENT_SCOPE)
   set("${sources_var_name}" "${de_gybbed_sources}" PARENT_SCOPE)
 endfunction()
+
+function(add_gyb_target target sources)
+  set(options)
+  set(single_value_args ARCH)
+  set(multi_value_args)
+  cmake_parse_arguments(GYB
+    "${options}" "${single_value_args}" "${multi_value_args}" ${ARGN})
+
+  handle_gyb_sources(gyb_sources_depends sources "${GYB_ARCH}")
+
+  add_custom_target(${target}
+    DEPENDS "${gyb_sources_depends}")
+endfunction()

cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -68,9 +68,9 @@ macro(swift_common_standalone_build_config_llvm product is_cross_compiling)
     set(${product}_NATIVE_LLVM_TOOLS_PATH "${LLVM_TOOLS_BINARY_DIR}")
   endif()
 
-  find_program(SWIFT_TABLEGEN_EXE "llvm-tblgen" "${${product}_NATIVE_LLVM_TOOLS_PATH}"
+  find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" "${${product}_NATIVE_LLVM_TOOLS_PATH}"
     NO_DEFAULT_PATH)
-  if ("${SWIFT_TABLEGEN_EXE}" STREQUAL "SWIFT_TABLEGEN_EXE-NOTFOUND")
+  if ("${LLVM_TABLEGEN_EXE}" STREQUAL "LLVM_TABLEGEN_EXE-NOTFOUND")
     message(FATAL_ERROR "Failed to find tablegen in ${${product}_NATIVE_LLVM_TOOLS_PATH}")
   endif()
 
@@ -219,7 +219,6 @@ macro(swift_common_unified_build_config product)
   set(${product}_NATIVE_LLVM_TOOLS_PATH "${CMAKE_BINARY_DIR}/bin")
   set(${product}_NATIVE_CLANG_TOOLS_PATH "${CMAKE_BINARY_DIR}/bin")
   set(LLVM_PACKAGE_VERSION ${PACKAGE_VERSION})
-  set(SWIFT_TABLEGEN_EXE llvm-tblgen)
   set(LLVM_CMAKE_DIR "${CMAKE_SOURCE_DIR}/cmake/modules")
 
   # If cmark was checked out into tools/cmark, expect to build it as
@@ -257,6 +256,11 @@ endmacro()
 # Common cmake project config for additional warnings.
 #
 macro(swift_common_cxx_warnings)
+  # Make unhandled switch cases be an error in assert builds
+  if(DEFINED LLVM_ENABLE_ASSERTIONS)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=switch")
+  endif()
+
   check_cxx_compiler_flag("-Werror -Wdocumentation" CXX_SUPPORTS_DOCUMENTATION_FLAG)
   append_if(CXX_SUPPORTS_DOCUMENTATION_FLAG "-Wdocumentation" CMAKE_CXX_FLAGS)