---

yaml
---
r: 340831
b: refs/heads/rxwei-patch-1
c: c512946
h: refs/heads/master
i:
  340829: 76360b7
  340827: acfae3c
  340823: 4a66c26
  340815: a5b0541
  340799: fba5d54

Author: Catfish-Man

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 379d88cb122447bdd507b835e2f7b651ec09c6a0
+refs/heads/rxwei-patch-1: c51294671bf2b9587f4de57ed834633359d84db3
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/CMakeLists.txt

@@ -845,18 +845,14 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" AND NOT CMAKE_CROSSCOMPILING)
   set(CMAKE_OSX_DEPLOYMENT_TARGET "")
 endif()
 
-if(SWIFT_INCLUDE_TOOLS)
-  message(STATUS "Building host Swift tools for ${SWIFT_HOST_VARIANT_SDK} ${SWIFT_HOST_VARIANT_ARCH}")
-  message(STATUS "  Build type:     ${CMAKE_BUILD_TYPE}")
-  message(STATUS "  Assertions:     ${LLVM_ENABLE_ASSERTIONS}")
-  message(STATUS "  LTO:            ${SWIFT_TOOLS_ENABLE_LTO}")
-  message(STATUS "")
-else()
-  message(STATUS "Not building host Swift tools")
-  message(STATUS "")
-endif()
+message(STATUS "Building host Swift tools for ${SWIFT_HOST_VARIANT_SDK} ${SWIFT_HOST_VARIANT_ARCH}")
+message(STATUS "  Build type:     ${CMAKE_BUILD_TYPE}")
+message(STATUS "  Assertions:     ${LLVM_ENABLE_ASSERTIONS}")
+message(STATUS "  LTO:            ${SWIFT_TOOLS_ENABLE_LTO}")
+message(STATUS "")
+
+if (SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
 
-if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "Building Swift standard library and overlays for SDKs: ${SWIFT_SDKS}")
   message(STATUS "  Build type:       ${SWIFT_STDLIB_BUILD_TYPE}")
   message(STATUS "  Assertions:       ${SWIFT_STDLIB_ASSERTIONS}")
@@ -865,9 +861,12 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "Building Swift runtime with:")
   message(STATUS "  Leak Detection Checker Entrypoints: ${SWIFT_RUNTIME_ENABLE_LEAK_CHECKER}")
   message(STATUS "")
+
 else()
+
   message(STATUS "Not building Swift standard library, SDK overlays, and runtime")
   message(STATUS "")
+
 endif()
 
 #

branches/rxwei-patch-1/cmake/modules/AddSwift.cmake

@@ -462,10 +462,10 @@ function(_add_variant_link_flags)
     list(APPEND link_libraries "bsd" "atomic")
     list(APPEND result "-Wl,-Bsymbolic")
   elseif("${LFLAGS_SDK}" STREQUAL "ANDROID")
-    list(APPEND link_libraries "dl" "log" "atomic")
-    # We need to add the math library, which is linked implicitly by libc++
-    list(APPEND result "-lm")
-
+    list(APPEND link_libraries "dl" "log" "atomic" "icudataswift" "icui18nswift" "icuucswift")
+    # We provide our own C++ below, so we ask the linker not to do it. However,
+    # we need to add the math library, which is linked implicitly by libc++.
+    list(APPEND result "-nostdlib++" "-lm")
     if("${LFLAGS_ARCH}" MATCHES armv7)
       set(android_libcxx_path "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a")
     elseif("${LFLAGS_ARCH}" MATCHES aarch64)
@@ -477,17 +477,8 @@ function(_add_variant_link_flags)
     else()
       message(SEND_ERROR "unknown architecture (${LFLAGS_ARCH}) for android")
     endif()
-
-    # link against the custom C++ library
-    list(APPEND link_libraries
-      ${android_libcxx_path}/libc++abi.a
-      ${android_libcxx_path}/libc++_shared.so)
-
-    # link against the ICU libraries
-    list(APPEND link_libraries
-      ${SWIFT_ANDROID_${LFLAGS_ARCH}_ICU_I18N}
-      ${SWIFT_ANDROID_${LFLAGS_ARCH}_ICU_UC})
-
+    list(APPEND link_libraries "${android_libcxx_path}/libc++abi.a")
+    list(APPEND link_libraries "${android_libcxx_path}/libc++_shared.so")
     swift_android_lib_for_arch(${LFLAGS_ARCH} ${LFLAGS_ARCH}_LIB)
     foreach(path IN LISTS ${LFLAGS_ARCH}_LIB)
       list(APPEND library_search_directories ${path})
@@ -526,12 +517,8 @@ function(_add_variant_link_flags)
         NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WINDOWS"))
       list(APPEND result "-fuse-ld=lld")
     elseif(SWIFT_ENABLE_GOLD_LINKER AND
-        "${SWIFT_SDK_${LFLAGS_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
-      if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
-        list(APPEND result "-fuse-ld=gold.exe")
-      else()
-        list(APPEND result "-fuse-ld=gold")
-      endif()
+       "${SWIFT_SDK_${LFLAGS_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
+      list(APPEND result "-fuse-ld=gold")
     endif()
   endif()
 
@@ -1380,16 +1367,8 @@ function(_add_swift_library_single target name)
         ${SWIFTLIB_SINGLE_PRIVATE_LINK_LIBRARIES})
   endif()
 
-  # NOTE(compnerd) use the C linker language to invoke `clang` rather than
-  # `clang++` as we explicitly link against the C++ runtime.  We were previously
-  # actually passing `-nostdlib++` to avoid the C++ runtime linkage.
-  if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "ANDROID")
-    set_property(TARGET "${target}" PROPERTY
-      LINKER_LANGUAGE "C")
-  else()
-    set_property(TARGET "${target}" PROPERTY
+  set_property(TARGET "${target}" PROPERTY
       LINKER_LANGUAGE "CXX")
-  endif()
 
   if(target_static)
     set_property(TARGET "${target_static}" APPEND_STRING PROPERTY
@@ -2346,17 +2325,6 @@ function(_add_swift_executable_single name)
   target_link_libraries("${name}" PRIVATE ${SWIFTEXE_SINGLE_LINK_LIBRARIES})
   swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_LINK_COMPONENTS})
 
-  # NOTE(compnerd) use the C linker language to invoke `clang` rather than
-  # `clang++` as we explicitly link against the C++ runtime.  We were previously
-  # actually passing `-nostdlib++` to avoid the C++ runtime linkage.
-  if(SWIFTEXE_SINGLE_SDK STREQUAL ANDROID)
-    set_property(TARGET "${name}" PROPERTY
-      LINKER_LANGUAGE "C")
-  else()
-    set_property(TARGET "${name}" PROPERTY
-      LINKER_LANGUAGE "CXX")
-  endif()
-
   set_target_properties(${name} PROPERTIES FOLDER "Swift executables")
 endfunction()
 

branches/rxwei-patch-1/cmake/modules/SwiftConfigureSDK.cmake

@@ -28,7 +28,7 @@ function(_report_sdk prefix)
       message(STATUS "  ${arch} LIB: ${${arch}_LIB}")
     endforeach()
   elseif("${prefix}" STREQUAL "ANDROID")
-    message(STATUS " NDK: $ENV{SWIFT_ANDROID_NDK_PATH}")
+    message(STATUS " NDK Dir: $ENV{SWIFT_ANDROID_NDK_PATH}")
     foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
       swift_android_include_for_arch(${arch} ${arch}_INCLUDE)
       swift_android_lib_for_arch(${arch} ${arch}_LIB)
@@ -225,14 +225,10 @@ macro(configure_sdk_unix name architectures)
       endif()
 
       # Get the prebuilt suffix to create the correct toolchain path when using the NDK
-      if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin)
-        set(_swift_android_prebuilt_build darwin-x86_64)
-      elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL Linux)
-        set(_swift_android_prebuilt_build linux-x86_64)
-      elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
-        set(_swift_android_prebuilt_build Windows-x86_64)
-      else()
-        message(SEND_ERROR "cannot cross-compile to android from ${CMAKE_HOST_SYSTEM_NAME}")
+      if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
+        set(_swift_android_prebuilt_build "darwin-x86_64")
+      elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
+        set(_swift_android_prebuilt_build "linux-x86_64")
       endif()
       if("${arch}" STREQUAL "i686")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_PREBUILT_PATH

branches/rxwei-patch-1/cmake/modules/SwiftSource.cmake

@@ -269,7 +269,6 @@ function(_compile_swift_files
   # into the new runtime.
   if (SWIFTFILE_IS_STDLIB OR SWIFTFILE_IS_SDK_OVERLAY)
     list(APPEND swift_flags "-runtime-compatibility-version" "none")
-    list(APPEND swift_flags "-disable-autolinking-runtime-compatibility-dynamic-replacements")
   endif()
 
   if (SWIFTFILE_IS_STDLIB_CORE OR SWIFTFILE_IS_SDK_OVERLAY)

branches/rxwei-patch-1/docs/ABI/Mangling.rst

@@ -512,7 +512,6 @@ Types
   FUNCTION-KIND ::= 'U'                      // uncurried function type (currently not used)
   FUNCTION-KIND ::= 'K'                      // @auto_closure function type (noescape)
   FUNCTION-KIND ::= 'B'                      // objc block function type
-  FUNCTION-KIND ::= 'L'                      // objc block function type (escaping) (DWARF only; otherwise use 'B')
   FUNCTION-KIND ::= 'C'                      // C function pointer type
   FUNCTION-KIND ::= 'A'                      // @auto_closure function type (escaping)
   FUNCTION-KIND ::= 'E'                      // function type (noescape)

branches/rxwei-patch-1/docs/WindowsBuild.md

@@ -355,8 +355,8 @@ cmake -G Ninja^
   -DFOUNDATION_BUILD_DIR=S:\b\foundation^
   -DLIBDISPATCH_BUILD_DIR=S:\b\libdispatch^
   -DLIBDISPATCH_SOURCE_DIR=S:\swift-corelibs-libdispatch^
-  -DSQLite3_INCLUDE_DIR=S:\sqlite-amalgamation-3270200^
-  -DSQLite3_LIBRARY=S:\b\sqlite\sqlite3.lib^
+  -DLLBUILD_PATH_TO_SQLITE_SOURCE=S:\sqlite-amalgamation-3270200^
+  -DLLBUILD_PATH_TO_SQLITE_BUILD=S:\b\sqlite^
   -DLLBUILD_SUPPORT_BINDINGS=Swift^
   S:\llbuild
 ninja

branches/rxwei-patch-1/include/swift/AST/ASTContext.h

@@ -590,10 +590,6 @@ class ASTContext final {
   /// Get the runtime availability of the opaque types language feature for the target platform.
   AvailabilityContext getOpaqueTypeAvailability();
 
-  /// Get the runtime availability of features introduced in the Swift 5.1
-  /// compiler for the target platform.
-  AvailabilityContext getSwift51Availability();
-
   //===--------------------------------------------------------------------===//
   // Diagnostics Helper functions
   //===--------------------------------------------------------------------===//