---

yaml
---
r: 294143
b: refs/heads/tensorflow
c: 90d9721
h: refs/heads/master
i:
  294141: 22145bd
  294139: 1095797
  294135: 5470eb9
  294127: 3772ca4
  294111: 7e336a0
  294079: 386fd99
  294015: 3666438
  293887: bed83aa

Author: DougGregor

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: de4ebd33bed70887b598b28538c29be001b7c8f6
+refs/heads/tensorflow: 90d972147391df8b1b21ecacc0b0b5160b1ac114
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/CMakeLists.txt

@@ -93,15 +93,6 @@ option(SWIFT_INCLUDE_DOCS
     "Create targets for building docs."
     TRUE)
 
-set(_swift_include_apinotes_default FALSE)
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  set(_swift_include_apinotes_default TRUE)
-endif()
-
-option(SWIFT_INCLUDE_APINOTES
-  "Create targets for installing the remaining apinotes in the built toolchain."
-  ${_swift_include_apinotes_default})
-
 #
 # Miscellaneous User-configurable options.
 #
@@ -1049,12 +1040,14 @@ endif()
 # created. This then will cause SwiftSyntax to fail to build.
 #
 # https://bugs.swift.org/browse/SR-5975
-if(SWIFT_BUILD_STDLIB)
-  add_subdirectory(stdlib)
-endif()
+add_subdirectory(stdlib)
 
-if(SWIFT_INCLUDE_APINOTES)
-  add_subdirectory(apinotes)
+if(SWIFT_BUILD_SDK_OVERLAY)
+  list_intersect("${SWIFT_APPLE_PLATFORMS}" "${SWIFT_SDKS}"
+                 building_darwin_sdks)
+  if(building_darwin_sdks)
+    add_subdirectory(apinotes)
+  endif()
 endif()
 
 add_subdirectory(include)

branches/tensorflow/apinotes/CMakeLists.txt

@@ -23,11 +23,15 @@ add_custom_command(
     COMMAND
       "${CMAKE_COMMAND}" "-E" "copy_if_different" ${inputs} "${output_dir}/")
 
-add_custom_target("copy_apinotes" ALL
+add_custom_target("copy_apinotes"
     DEPENDS "${outputs}" "${output_dir}"
     COMMENT "Copying API notes to ${output_dir}"
     SOURCES "${sources}")
 
+# This is treated as an OPTIONAL target because if we don't build the SDK
+# overlay, the files will be missing anyway. It also allows us to build
+# single overlays without installing the API notes.
 swift_install_in_component(DIRECTORY "${output_dir}"
                            DESTINATION "lib/swift/"
-                           COMPONENT compiler)
+                           COMPONENT sdk-overlay
+                           OPTIONAL)

branches/tensorflow/benchmark/single-source/ExistentialPerformance.swift

@@ -264,6 +264,17 @@ func caRef1() { ca(Ref1.self) }
 func caRef2() { ca(Ref2.self) }
 func caRef3() { ca(Ref3.self) }
 func caRef4() { ca(Ref4.self) }
+@inline(never)
+func grabArray() -> [Existential] { // transfer array ownership to caller
+  // FIXME: This is causing Illegal Instruction: 4 crash
+  // defer { array = nil }
+  // return array
+  // This doesn't work either:
+  // let a = array!
+  // array = nil
+  // return a
+  return array!
+}
 
 // `setUpFunctions` that determine which existential type will be tested
 var existentialType: Existential.Type!
@@ -529,7 +540,7 @@ func run_Array_init(_ N: Int) {
 }
 
 func run_Array_method1x(_ N: Int) {
-  let existentialArray = array!
+  let existentialArray = grabArray()
   for _ in 0 ..< N * 100 {
     for elt in existentialArray {
       if !elt.doIt()  {
@@ -540,7 +551,7 @@ func run_Array_method1x(_ N: Int) {
 }
 
 func run_Array_method2x(_ N: Int) {
-  let existentialArray = array!
+  let existentialArray = grabArray()
   for _ in 0 ..< N * 100 {
     for elt in existentialArray {
       if !elt.doIt() || !elt.reallyDoIt() {
@@ -551,8 +562,8 @@ func run_Array_method2x(_ N: Int) {
 }
 
 func run_ArrayMutating(_ N: Int) {
-  var existentialArray = array!
-  for _ in 0 ..< N * 500 {
+  var existentialArray = grabArray()
+  for _ in 0 ..< N * 100 {
     for i in 0 ..< existentialArray.count {
       if !existentialArray[i].mutateIt()  {
         fatalError("expected true")
@@ -562,7 +573,7 @@ func run_ArrayMutating(_ N: Int) {
 }
 
 func run_ArrayShift(_ N: Int) {
-  var existentialArray = array!
+  var existentialArray = grabArray()
   for _ in 0 ..< N * 25 {
     for i in 0 ..< existentialArray.count-1 {
       existentialArray.swapAt(i, i+1)
@@ -571,7 +582,7 @@ func run_ArrayShift(_ N: Int) {
 }
 
 func run_ArrayConditionalShift(_ N: Int) {
-  var existentialArray = array!
+  var existentialArray = grabArray()
   for _ in 0 ..< N * 25 {
     for i in 0 ..< existentialArray.count-1 {
       let curr = existentialArray[i]

branches/tensorflow/benchmark/single-source/ExistentialPerformance.swift.gyb

@@ -36,8 +36,8 @@ Setup = """
   let existential = existentialType.init()
   let existential2 = existentialType.init()
   var existential = existentialType.init()
-  let existentialArray = array!
-  var existentialArray = array!
+  let existentialArray = grabArray()
+  var existentialArray = grabArray()
 """.splitlines()
 Setup = [Setup[0], Setup[1], '\n'.join(Setup[1:3]), Setup[3], Setup[4], Setup[5]]
 
@@ -90,7 +90,7 @@ Workloads = [
       }
     }
 """),
-  ('Array.Mutating', Setup[5], '500', """
+  ('Array.Mutating', Setup[5], '100', """
     for i in 0 ..< existentialArray.count {
       if !existentialArray[i].mutateIt()  {
         fatalError("expected true")
@@ -151,6 +151,17 @@ func ca<T: Existential>(_: T.Type) {
 % for Variant in Vals + Refs:
 func ca${Variant}() { ca(${Variant}.self) }
 % end
+@inline(never)
+func grabArray() -> [Existential] { // transfer array ownership to caller
+  // FIXME: This is causing Illegal Instruction: 4 crash
+  // defer { array = nil }
+  // return array
+  // This doesn't work either:
+  // let a = array!
+  // array = nil
+  // return a
+  return array!
+}
 
 // `setUpFunctions` that determine which existential type will be tested
 var existentialType: Existential.Type!

branches/tensorflow/cmake/modules/AddSwift.cmake

@@ -642,7 +642,7 @@ endfunction()
 #     [LINK_LIBRARIES dep1 ...]
 #     [FRAMEWORK_DEPENDS dep1 ...]
 #     [FRAMEWORK_DEPENDS_WEAK dep1 ...]
-#     [LLVM_LINK_COMPONENTS comp1 ...]
+#     [LLVM_COMPONENT_DEPENDS comp1 ...]
 #     [C_COMPILE_FLAGS flag1...]
 #     [SWIFT_COMPILE_FLAGS flag1...]
 #     [LINK_FLAGS flag1...]
@@ -688,7 +688,7 @@ endfunction()
 # FRAMEWORK_DEPENDS_WEAK
 #   System frameworks this library depends on that should be weakly-linked.
 #
-# LLVM_LINK_COMPONENTS
+# LLVM_COMPONENT_DEPENDS
 #   LLVM components this library depends on.
 #
 # C_COMPILE_FLAGS
@@ -750,9 +750,10 @@ function(_add_swift_library_single target name)
         GYB_SOURCES
         INCORPORATE_OBJECT_LIBRARIES
         INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY
+        INTERFACE_LINK_LIBRARIES
         LINK_FLAGS
         LINK_LIBRARIES
-        LLVM_LINK_COMPONENTS
+        LLVM_COMPONENT_DEPENDS
         PRIVATE_LINK_LIBRARIES
         SWIFT_COMPILE_FLAGS)
 
@@ -891,6 +892,7 @@ function(_add_swift_library_single target name)
         ${SWIFTLIB_SINGLE_DEPENDS}
         ${SWIFTLIB_SINGLE_FILE_DEPENDS}
         ${SWIFTLIB_SINGLE_LINK_LIBRARIES}
+        ${SWIFTLIB_SINGLE_INTERFACE_LINK_LIBRARIES}
       SDK ${SWIFTLIB_SINGLE_SDK}
       ARCHITECTURE ${SWIFTLIB_SINGLE_ARCHITECTURE}
       MODULE_NAME ${module_name}
@@ -1188,7 +1190,7 @@ function(_add_swift_library_single target name)
 
   if(NOT SWIFTLIB_SINGLE_TARGET_LIBRARY)
     # Call llvm_config() only for libraries that are part of the compiler.
-    swift_common_llvm_config("${target}" ${SWIFTLIB_SINGLE_LLVM_LINK_COMPONENTS})
+    swift_common_llvm_config("${target}" ${SWIFTLIB_SINGLE_LLVM_COMPONENT_DEPENDS})
   endif()
 
   # Collect compile and link flags for the static and non-static targets.
@@ -1311,7 +1313,7 @@ function(_add_swift_library_single target name)
   # import library targets when the library was added.  Use that to adjust the
   # link libraries.
   if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS AND NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
-    foreach(library_list LINK_LIBRARIES PRIVATE_LINK_LIBRARIES)
+    foreach(library_list LINK_LIBRARIES INTERFACE_LINK_LIBRARIES PRIVATE_LINK_LIBRARIES)
       set(import_libraries)
       foreach(library ${SWIFTLIB_SINGLE_${library_list}})
         # Ensure that the library is a target.  If an absolute path was given,
@@ -1340,6 +1342,14 @@ function(_add_swift_library_single target name)
     target_link_libraries("${target}" PRIVATE
         ${SWIFTLIB_SINGLE_PRIVATE_LINK_LIBRARIES})
   endif()
+  if("${libkind}" STREQUAL "OBJECT")
+    precondition_list_empty(
+        "${SWIFTLIB_SINGLE_INTERFACE_LINK_LIBRARIES}"
+        "OBJECT_LIBRARY may not link to anything")
+  else()
+    target_link_libraries("${target}" INTERFACE
+        ${SWIFTLIB_SINGLE_INTERFACE_LINK_LIBRARIES})
+  endif()
 
   set_property(TARGET "${target}" PROPERTY
       LINKER_LANGUAGE "CXX")
@@ -1366,7 +1376,7 @@ endfunction()
 #   add_swift_host_library(name
 #     [SHARED]
 #     [STATIC]
-#     [LLVM_LINK_COMPONENTS comp1 ...]
+#     [LLVM_COMPONENT_DEPENDS comp1 ...]
 #     [FILE_DEPENDS target1 ...]
 #     source1 [source2 source3 ...])
 #
@@ -1379,7 +1389,7 @@ endfunction()
 # STATIC
 #   Build a static library.
 #
-# LLVM_LINK_COMPONENTS
+# LLVM_COMPONENT_DEPENDS
 #   LLVM components this library depends on.
 #
 # FILE_DEPENDS
@@ -1397,8 +1407,9 @@ function(add_swift_host_library name)
         C_COMPILE_FLAGS
         DEPENDS
         FILE_DEPENDS
+        INTERFACE_LINK_LIBRARIES
         LINK_LIBRARIES
-        LLVM_LINK_COMPONENTS)
+        LLVM_COMPONENT_DEPENDS)
 
   cmake_parse_arguments(ASHL
                         "${options}"
@@ -1413,6 +1424,9 @@ function(add_swift_host_library name)
   if(ASHL_DEPENDS)
     message(SEND_ERROR "library ${name} is using DEPENDS parameter which is deprecated.  Please use add_dependencies instead")
   endif()
+  if(ASHL_INTERFACE_LINK_LIBRARIES)
+    message(SEND_ERROR "library ${name} is using INTERFACE_LINK_LIBRARIES parameter which is deprecated.  Please use target_link_libraries instead.")
+  endif()
   if(ASHL_LINK_LIBRARIES)
     message(SEND_ERROR "library ${name} is using LINK_LIBRARIES parameter which is deprecated.  Please use target_link_libraries instead")
   endif()
@@ -1432,7 +1446,7 @@ function(add_swift_host_library name)
     ${ASHL_FORCE_BUILD_OPTIMIZED_keyword}
     SDK ${SWIFT_HOST_VARIANT_SDK}
     ARCHITECTURE ${SWIFT_HOST_VARIANT_ARCH}
-    LLVM_LINK_COMPONENTS ${ASHL_LLVM_LINK_COMPONENTS}
+    LLVM_COMPONENT_DEPENDS ${ASHL_LLVM_COMPONENT_DEPENDS}
     FILE_DEPENDS ${ASHL_FILE_DEPENDS}
     INSTALL_IN_COMPONENT "dev"
     )
@@ -1464,10 +1478,11 @@ endfunction()
 #     [STATIC]
 #     [DEPENDS dep1 ...]
 #     [LINK_LIBRARIES dep1 ...]
+#     [INTERFACE_LINK_LIBRARIES dep1 ...]
 #     [SWIFT_MODULE_DEPENDS dep1 ...]
 #     [FRAMEWORK_DEPENDS dep1 ...]
 #     [FRAMEWORK_DEPENDS_WEAK dep1 ...]
-#     [LLVM_LINK_COMPONENTS comp1 ...]
+#     [LLVM_COMPONENT_DEPENDS comp1 ...]
 #     [FILE_DEPENDS target1 ...]
 #     [TARGET_SDKS sdk1...]
 #     [C_COMPILE_FLAGS flag1...]
@@ -1533,7 +1548,7 @@ endfunction()
 # FRAMEWORK_DEPENDS_WEAK
 #   System frameworks this library depends on that should be weak-linked
 #
-# LLVM_LINK_COMPONENTS
+# LLVM_COMPONENT_DEPENDS
 #   LLVM components this library depends on.
 #
 # FILE_DEPENDS
@@ -1616,9 +1631,10 @@ function(add_swift_target_library name)
         GYB_SOURCES
         INCORPORATE_OBJECT_LIBRARIES
         INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY
+        INTERFACE_LINK_LIBRARIES
         LINK_FLAGS
         LINK_LIBRARIES
-        LLVM_LINK_COMPONENTS
+        LLVM_COMPONENT_DEPENDS
         PRIVATE_LINK_LIBRARIES
         SWIFT_COMPILE_FLAGS
         SWIFT_COMPILE_FLAGS_IOS
@@ -1890,7 +1906,7 @@ function(add_swift_target_library name)
         LINK_LIBRARIES ${swiftlib_link_libraries}
         FRAMEWORK_DEPENDS ${swiftlib_framework_depends_flattened}
         FRAMEWORK_DEPENDS_WEAK ${SWIFTLIB_FRAMEWORK_DEPENDS_WEAK}
-        LLVM_LINK_COMPONENTS ${SWIFTLIB_LLVM_LINK_COMPONENTS}
+        LLVM_COMPONENT_DEPENDS ${SWIFTLIB_LLVM_COMPONENT_DEPENDS}
         FILE_DEPENDS ${SWIFTLIB_FILE_DEPENDS} ${swiftlib_module_dependency_targets}
         C_COMPILE_FLAGS ${swiftlib_c_compile_flags_all}
         SWIFT_COMPILE_FLAGS ${swiftlib_swift_compile_flags_all} ${swiftlib_swift_compile_flags_arch} ${swiftlib_swift_compile_private_frameworks_flag}
@@ -2106,7 +2122,7 @@ function(_add_swift_executable_single name)
   cmake_parse_arguments(SWIFTEXE_SINGLE
     "EXCLUDE_FROM_ALL"
     "SDK;ARCHITECTURE"
-    "DEPENDS;LLVM_LINK_COMPONENTS;LINK_LIBRARIES;COMPILE_FLAGS"
+    "DEPENDS;LLVM_COMPONENT_DEPENDS;LINK_LIBRARIES;COMPILE_FLAGS"
     ${ARGN})
 
   set(SWIFTEXE_SINGLE_SOURCES ${SWIFTEXE_SINGLE_UNPARSED_ARGUMENTS})
@@ -2207,7 +2223,7 @@ function(_add_swift_executable_single name)
       LIBRARY_DIR ${SWIFT_LIBRARY_OUTPUT_INTDIR})
 
   target_link_libraries("${name}" PRIVATE ${SWIFTEXE_SINGLE_LINK_LIBRARIES})
-  swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_LINK_COMPONENTS})
+  swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_COMPONENT_DEPENDS})
 
   set_target_properties(${name} PROPERTIES FOLDER "Swift executables")
 endfunction()