Merge branch 'master' into RemoveRedundantBufferZeroingNSStringAPI

Author: valeriyvan

README.md

@@ -149,6 +149,8 @@ sudo apt-get install    \
 **Note:** LLDB currently requires at least `swig-1.3.40` but will successfully build
 with version 2 shipped with Ubuntu.
 
+**Note:** For Ubuntu 20.04, use `libpython2-dev` in place of the libpython-dev package above.
+
 Build instructions for Ubuntu 14.04 LTS can be found [here](docs/Ubuntu14.md).
 
 ### Getting Sources for Swift and Related Projects

benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

@@ -189,7 +189,7 @@ function (add_swift_benchmark_library objfile_out sibfile_out swiftmodule_out)
     DEPENDS ${stdlib_dependencies} ${sources} ${BENCHLIB_DEPENDS}
     COMMAND "${SWIFT_EXEC}"
       ${BENCHLIB_LIBRARY_FLAGS}
-      "-force-single-frontend-invocation"
+      "-whole-module-optimization"
       "-parse-as-library"
       "-module-name" "${module_name}"
       "-emit-module" "-emit-module-path" "${swiftmodule}"
@@ -209,7 +209,7 @@ function (add_swift_benchmark_library objfile_out sibfile_out swiftmodule_out)
       ${stdlib_dependencies} ${sources} ${BENCHLIB_DEPENDS}
       COMMAND "${SWIFT_EXEC}"
         ${BENCHLIB_LIBRARY_FLAGS}
-        "-force-single-frontend-invocation"
+        "-whole-module-optimization"
         "-parse-as-library"
         "-module-name" "${module_name}"
         "-emit-sib"
@@ -574,7 +574,7 @@ function (swift_benchmark_compile_archopts)
         ${SWIFT_BENCH_SIBFILES} "${source}"
       COMMAND "${SWIFT_EXEC}"
       ${common_swift4_options}
-      "-force-single-frontend-invocation"
+      "-whole-module-optimization"
       "-emit-module" "-module-name" "${module_name}"
       "-I" "${objdir}"
       "-o" "${objdir}/${module_name}.o"

benchmark/single-source/ProtocolDispatch2.swift

@@ -19,7 +19,7 @@ import TestsUtils
 public let ProtocolDispatch2 = BenchmarkInfo(
   name: "ProtocolDispatch2",
   runFunction: run_ProtocolDispatch2,
-  tags: [.validation, .abstraction])
+  tags: [.validation, .abstraction, .cpubench])
 
 protocol Pingable { func ping() -> Int;  func pong() -> Int}
 

cmake/modules/AddSwift.cmake

@@ -5,6 +5,18 @@ include(SwiftWindowsSupport)
 include(SwiftAndroidSupport)
 
 function(_swift_gyb_target_sources target scope)
+  file(GLOB GYB_UNICODE_DATA ${SWIFT_SOURCE_DIR}/utils/UnicodeData/*)
+  file(GLOB GYB_STDLIB_SUPPORT ${SWIFT_SOURCE_DIR}/utils/gyb_stdlib_support.py)
+  file(GLOB GYB_SYNTAX_SUPPORT ${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/*)
+  file(GLOB GYB_SOURCEKIT_SUPPORT ${SWIFT_SOURCE_DIR}/utils/gyb_sourcekit_support/*)
+  set(GYB_SOURCES
+    ${SWIFT_SOURCE_DIR}/utils/GYBUnicodeDataUtils.py
+    ${SWIFT_SOURCE_DIR}/utils/SwiftIntTypes.py
+    ${GYB_UNICODE_DATA}
+    ${GYB_STDLIB_SUPPORT}
+    ${GYB_SYNTAX_SUPPORT}
+    ${GYB_SOURCEKIT_SUPPORT})
+
   foreach(source ${ARGN})
     get_filename_component(generated ${source} NAME_WLE)
     get_filename_component(absolute ${source} REALPATH)
@@ -17,6 +29,7 @@ function(_swift_gyb_target_sources target scope)
       COMMAND
         ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/${generated}.tmp
       DEPENDS
+        ${GYB_SOURCES}
         ${absolute})
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${generated} PROPERTIES
       GENERATED TRUE)
@@ -78,11 +91,10 @@ endfunction()
 
 # Usage:
 # _add_host_variant_c_compile_link_flags(
-#   ANALYZE_CODE_COVERAGE analyze_code_coverage
 #   RESULT_VAR_NAME result_var_name
 # )
 function(_add_host_variant_c_compile_link_flags)
-  set(oneValueArgs RESULT_VAR_NAME ANALYZE_CODE_COVERAGE)
+  set(oneValueArgs RESULT_VAR_NAME)
   cmake_parse_arguments(CFLAGS
     ""
     "${oneValueArgs}"
@@ -131,11 +143,6 @@ function(_add_host_variant_c_compile_link_flags)
       "-m${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_VERSION_MIN_NAME}-version-min=${DEPLOYMENT_VERSION}")
   endif()
 
-  if(CFLAGS_ANALYZE_CODE_COVERAGE)
-    list(APPEND result "-fprofile-instr-generate"
-                       "-fcoverage-mapping")
-  endif()
-
   _compute_lto_flag("${SWIFT_TOOLS_ENABLE_LTO}" _lto_flag_out)
   if (_lto_flag_out)
     list(APPEND result "${_lto_flag_out}")
@@ -146,9 +153,7 @@ endfunction()
 
 
 function(_add_host_variant_c_compile_flags target)
-  _add_host_variant_c_compile_link_flags(
-    ANALYZE_CODE_COVERAGE FALSE
-    RESULT_VAR_NAME result)
+  _add_host_variant_c_compile_link_flags(RESULT_VAR_NAME result)
   target_compile_options(${target} PRIVATE
     ${result})
 
@@ -313,9 +318,7 @@ function(_add_host_variant_c_compile_flags target)
 endfunction()
 
 function(_add_host_variant_link_flags target)
-  _add_host_variant_c_compile_link_flags(
-    ANALYZE_CODE_COVERAGE ${SWIFT_ANALYZE_CODE_COVERAGE}
-    RESULT_VAR_NAME result)
+  _add_host_variant_c_compile_link_flags(RESULT_VAR_NAME result)
   target_link_options(${target} PRIVATE
     ${result})
 

docs/CompilerPerformance.md

@@ -100,8 +100,7 @@ running in, and often to perform separate analysis for each mode. The
 significant modes are:
 
   - **Primary-file** vs. **whole-module**: this varies depending on whether the
-    driver is run with the flag `-wmo`, `-whole-module-optimization` or
-    `-force-single-frontend-invocation` (all these options are synonymous).
+    driver is run with the flag `-wmo` (a.k.a. `-whole-module-optimization`).
 
     - **Batch** vs. **single-file** primary-file mode. This distinction refines
     the behaviour of primary-file mode, with the new batch mode added in the