---

yaml
---
r: 294583
b: refs/heads/tensorflow
c: 7d8c543
h: refs/heads/master
i:
  294581: 3c38756
  294579: aa29292
  294575: 3d2bd53

Author: Gumichocopengin8

[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: 22e64f05be125934eb44fb3a8a177dc42f212735
+refs/heads/tensorflow: 7d8c54329c6cb40a982fffe1f904b9510f4ac956
 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/.mailmap

@@ -29,11 +29,12 @@ Daniel Duan <[email protected]> <[email protected]>
 Dante Broggi <[email protected]>
 Dave <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
+Dave Abrahams <[email protected]> <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
 Dave Lee <[email protected]> <[email protected]>
-David Rönnqvist <[email protected]> <[email protected]>
-David Rönnqvist <[email protected]>
+David Rönnqvist <[email protected]> <[email protected]>
+David Rönnqvist <[email protected]>
 David Ungar <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
@@ -42,8 +43,10 @@ Davide Italiano <[email protected]> <[email protected]>
 Davide Italiano <[email protected]> <[email protected]>
 Dmitri Gribenko <[email protected]> <[email protected]>
 Doug Coleman <[email protected]> <[email protected]>
+Enrico Granata <[email protected]> <[email protected]>
 Enrico Granata <[email protected]> <[email protected]>
 Erik Eckstein <[email protected]>
+Erik Eckstein <[email protected]> <[email protected]>
 Erik Verbruggen <[email protected]> <[email protected]>
 Ewa Matejska <[email protected]>
 Ewa Matejska <[email protected]> <[email protected]>
@@ -127,13 +130,15 @@ Ross Bayer <[email protected]>
 Russ Bishop <[email protected]> <[email protected]>
 Ryan Lovelett <[email protected]> <[email protected]>
 Shawn Erickson <[email protected]> <[email protected]>
+Slava Pestov <[email protected]> <[email protected]>
 Slava Pestov <[email protected]> <[email protected]>
 Stephen Canon <[email protected]>
 Stephen Canon <[email protected]> <[email protected]>
 Sukolsak Sakshuwong <[email protected]>
 Todd Fiala <[email protected]> <[email protected]>
 Toni Suter <[email protected]> <[email protected]>
 Vedant Kumar <[email protected]> <[email protected]>
+Xi Ge <[email protected]> <[email protected]>
 Xin Tong <[email protected]> <[email protected]>
 Xin Tong <[email protected]> <[email protected]>
 Yuka Ezura <[email protected]> <[email protected]>

branches/tensorflow/CMakeLists.txt

@@ -117,11 +117,13 @@ endif()
 
 set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
     "Build Swift with code coverage instrumenting enabled [FALSE, NOT-MERGED, MERGED]")
+set_property(CACHE SWIFT_ANALYZE_CODE_COVERAGE PROPERTY
+    STRINGS FALSE "NOT-MERGED" "MERGED")
 
 # SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
 # can be reused when a new version of Swift comes out (assuming the user hasn't
 # manually set it as part of their own CMake configuration).
-set(SWIFT_VERSION "5.1")
+set(SWIFT_VERSION "5.0")
 
 set(SWIFT_VENDOR "" CACHE STRING
     "The vendor name of the Swift compiler")
@@ -169,20 +171,8 @@ endif()
 
 set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
     "Build type for the Swift standard library and SDK overlays [Debug, RelWithDebInfo, Release, MinSizeRel]")
-# Allow the user to specify the standard library CMAKE_MSVC_RUNTIME_LIBRARY
-# value.  The following values are valid:
-#   - MultiThreaded (/MT)
-#   - MultiThreadedDebug (/MTd)
-#   - MultiThreadedDLL (/MD)
-#   - MultiThreadedDebugDLL (/MDd)
-if(CMAKE_BUILD_TYPE STREQUAL Debug)
-  set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDebugDLL)
-else()
-  set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDLL)
-endif()
-set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY
-  ${SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default}
-  CACHE STRING "MSVC Runtime Library for the standard library")
+set_property(CACHE SWIFT_STDLIB_BUILD_TYPE PROPERTY
+    STRINGS "Debug" "RelWithDebInfo" "Release" "MinSizeRel")
 
 is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" swift_optimized)
 if(swift_optimized)
@@ -272,15 +262,9 @@ option(SWIFT_RUNTIME_CRASH_REPORTER_CLIENT
 set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
     "The name of the toolchain to pass to 'xcrun'")
 
-set(SWIFT_DARWIN_STDLIB_INSTALL_NAME_DIR "/usr/lib/swift" CACHE STRING
+set(SWIFT_DARWIN_STDLIB_INSTALL_NAME_DIR "@rpath" CACHE STRING
     "The directory of the install_name for standard library dylibs")
 
-# We don't want to use the same install_name_dir as the standard library which
-# will be installed in /usr/lib/swift. These private libraries should continue
-# to use @rpath for now.
-set(SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR "@rpath" CACHE STRING
-    "The directory of the install_name for the private standard library dylibs")
-
 set(SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX "10.9" CACHE STRING
     "Minimum deployment target version for OS X")
 

branches/tensorflow/README.md

@@ -25,7 +25,6 @@
 |**[macOS 10.13 (TensorFlow)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_macos_high_sierra_tensorflow.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow)|
 |**[Ubuntu 16.04 (TensorFlow with GPU)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_tensorflow_gpu.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu)|
 |**[Debian 9.5](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_debian_9.5.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_5/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_5)|
-|**[Windows 2019](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_windows_2019.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-windows-x86_64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-windows-x86_64)|
 
 
 ## Welcome to Swift

branches/tensorflow/benchmark/CMakeLists.txt

@@ -108,7 +108,6 @@ set(SWIFT_BENCH_MODULES
     single-source/NSError
     single-source/NSStringConversion
     single-source/NibbleSort
-    single-source/NIOChannelPipeline
     single-source/NopDeinit
     single-source/ObjectAllocation
     single-source/ObjectiveCBridging

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

@@ -93,7 +93,6 @@ import Memset
 import MonteCarloE
 import MonteCarloPi
 import NibbleSort
-import NIOChannelPipeline
 import NSDictionaryCastToSwift
 import NSError
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
@@ -273,7 +272,6 @@ registerBenchmark(NSErrorTest)
 registerBenchmark(NSStringConversion)
 #endif
 registerBenchmark(NibbleSort)
-registerBenchmark(NIOChannelPipeline)
 registerBenchmark(NopDeinit)
 registerBenchmark(ObjectAllocation)
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)

branches/tensorflow/benchmark/utils/main.swift

@@ -400,6 +400,12 @@ function(_add_variant_swift_compile_flags
     list(APPEND result "-D" "SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS")
   endif()
 
+  if(sdk STREQUAL WINDOWS)
+    list(APPEND result "-Xcc" "-D_MT")
+    # TODO(compnerd) handle /MT /MTd
+    list(APPEND result "-Xcc" "-D_DLL")
+  endif()
+
   set("${result_var_name}" "${result}" PARENT_SCOPE)
 endfunction()
 
@@ -738,7 +744,6 @@ function(_add_swift_library_single target name)
         DEPLOYMENT_VERSION_TVOS
         DEPLOYMENT_VERSION_WATCHOS
         INSTALL_IN_COMPONENT
-        DARWIN_INSTALL_NAME_DIR
         MODULE_TARGET
         SDK)
   set(SWIFTLIB_SINGLE_multiple_parameter_options
@@ -867,8 +872,13 @@ function(_add_swift_library_single target name)
     if("${SWIFTLIB_SINGLE_ARCHITECTURE}" MATCHES arm)
       list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS -Xcc;-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE)
     endif()
-    list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS
-      -libc;${SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY})
+    list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS -Xfrontend;-autolink-library;-Xfrontend;oldnames)
+    # TODO(compnerd) handle /MT and /MTd
+    if(CMAKE_BUILD_TYPE MATCHES Debug)
+      list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS -Xfrontend;-autolink-library;-Xfrontend;msvcrtd)
+    else()
+      list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS -Xfrontend;-autolink-library;-Xfrontend;msvcrt)
+    endif()
   endif()
 
   # FIXME: don't actually depend on the libraries in SWIFTLIB_SINGLE_LINK_LIBRARIES,
@@ -1047,10 +1057,6 @@ function(_add_swift_library_single target name)
       set(install_name_dir "@rpath")
     endif()
 
-    if(SWIFTLIB_SINGLE_DARWIN_INSTALL_NAME_DIR)
-      set(install_name_dir "${SWIFTLIB_SINGLE_DARWIN_INSTALL_NAME_DIR}")
-    endif()
-
     set_target_properties("${target}"
       PROPERTIES
       INSTALL_NAME_DIR "${install_name_dir}")
@@ -1603,8 +1609,7 @@ function(add_swift_target_library name)
         DEPLOYMENT_VERSION_OSX
         DEPLOYMENT_VERSION_TVOS
         DEPLOYMENT_VERSION_WATCHOS
-        INSTALL_IN_COMPONENT
-        DARWIN_INSTALL_NAME_DIR)
+        INSTALL_IN_COMPONENT)
   set(SWIFTLIB_multiple_parameter_options
         C_COMPILE_FLAGS
         DEPENDS
@@ -1905,7 +1910,6 @@ function(add_swift_target_library name)
         ${SWIFTLIB_TARGET_LIBRARY_keyword}
         ${SWIFTLIB_FORCE_BUILD_OPTIMIZED_keyword}
         ${SWIFTLIB_NOSWIFTRT_keyword}
-        DARWIN_INSTALL_NAME_DIR "${SWIFTLIB_DARWIN_INSTALL_NAME_DIR}"
         INSTALL_IN_COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
         DEPLOYMENT_VERSION_OSX "${SWIFTLIB_DEPLOYMENT_VERSION_OSX}"
         DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS}"

branches/tensorflow/cmake/modules/AddSwift.cmake

@@ -9,12 +9,6 @@ if(DEFINED SWIFT_MASTER_LOADED
 endif()
 
 
-list(APPEND CMAKE_MODULE_PATH
-  "${SWIFT_SOURCE_ROOT}/llvm/cmake/modules"
-  "${PROJECT_SOURCE_DIR}/../../../../cmake/modules"
-  "${PROJECT_SOURCE_DIR}/../../../cmake/modules")
-
-
 # -----------------------------------------------------------------------------
 # Preconditions
 
@@ -65,12 +59,21 @@ option(SWIFT_ENABLE_PARSEABLE_MODULE_INTERFACES
 set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
   "Build type for the Swift standard library and SDK overlays.")
 
+set_property(CACHE SWIFT_STDLIB_BUILD_TYPE PROPERTY
+  STRINGS
+    "Debug" "RelWithDebInfo" "Release" "MinSizeRel")
+
 # -----------------------------------------------------------------------------
 # Constants
 
 set(CMAKE_INSTALL_PREFIX
   "${SWIFT_DEST_ROOT}${TOOLCHAIN_DIR}/usr")
 
+list(APPEND CMAKE_MODULE_PATH
+  "${SWIFT_SOURCE_ROOT}/llvm/cmake/modules"
+  "${PROJECT_SOURCE_DIR}/../../../../cmake/modules"
+  "${PROJECT_SOURCE_DIR}/../../../cmake/modules")
+
 
 set(SWIFT_APPLE_PLATFORMS
   OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR)
@@ -80,7 +83,6 @@ set(SWIFT_APPLE_PLATFORMS
 set(BUILD_STANDALONE TRUE)
 set(SWIFT_BUILD_STANDALONE_OVERLAY TRUE)
 
-set(SWIFT_STDLIB_LIBRARY_BUILD_TYPES "SHARED")
 set(SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES "SHARED")
 
 

branches/tensorflow/cmake/modules/StandaloneOverlay.cmake

@@ -439,8 +439,8 @@ In the following we assume that all loops are canonicalized such that:
 2. The loop has one backedge.
 3. All exiting edges have a unique exit block.
 
-Motivation
-----------
+Motiviation
+-----------
 
 Consider the following simple loop::
 

branches/tensorflow/docs/ARCOptimization.rst

@@ -50,7 +50,6 @@ namespace clang {
 namespace swift {
   class ASTContext;
   enum class Associativity : unsigned char;
-  class AvailabilityContext;
   class BoundGenericType;
   class ClangNode;
   class ConstructorDecl;
@@ -585,9 +584,6 @@ class ASTContext final {
   void addDestructorCleanup(T &object) {
     addCleanup([&object]{ object.~T(); });
   }
-  
-  /// Get the runtime availability of the opaque types language feature for the target platform.
-  AvailabilityContext getOpaqueTypeAvailability();
 
   //===--------------------------------------------------------------------===//
   // Diagnostics Helper functions

branches/tensorflow/include/swift/AST/ASTContext.h

@@ -337,7 +337,8 @@ void printEnumElementsAsCases(
     llvm::DenseSet<EnumElementDecl *> &UnhandledElements,
     llvm::raw_ostream &OS);
 
-void getInheritedForPrinting(const Decl *decl, const PrintOptions &options,
+void getInheritedForPrinting(const Decl *decl,
+                             llvm::function_ref<bool(const Decl*)> shouldPrint,
                              llvm::SmallVectorImpl<TypeLoc> &Results);
 
 } // namespace swift