Merge pull request #4689 from swiftwasm/katei/merge-main-2022-07-12

Merge main 2022-07-12

Author: kateinoigakukun

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,7 +10,7 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+**Steps To Reproduce**
 Steps to reproduce the behavior:
 1.
 2.
@@ -22,7 +22,7 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Environment (please complete the following information):**
+**Environment (please fill out the following information)**
  - OS: [e.g. macOS 11.0]
  - Xcode Version/Tag/Branch:
 

CMakeLists.txt

@@ -192,16 +192,6 @@ option(SWIFT_STDLIB_ENABLE_UNICODE_DATA
     NOTE: Disabling this will cause many String methods to crash."
     TRUE)
 
-include(Threading)
-
-threading_package_default("${SWIFT_HOST_VARIANT_SDK}"
-  SWIFT_THREADING_PACKAGE_default)
-
-set(SWIFT_THREADING_PACKAGE "${SWIFT_THREADING_PACKAGE_default}"
-    CACHE STRING
-    "The threading package to use.  Must be one of 'none', 'pthreads',
-    'darwin', 'linux', 'win32', 'c11'.")
-
 option(SWIFT_BUILD_DYNAMIC_SDK_OVERLAY
     "Build dynamic variants of the Swift SDK overlay"
     TRUE)
@@ -594,6 +584,12 @@ cmake_dependent_option(SWIFT_ENABLE_SOURCEKIT_TESTS
   "Enable running SourceKit tests" TRUE
   "SWIFT_BUILD_SOURCEKIT" FALSE)
 
+option(SWIFT_THREADING_PACKAGE
+  "Override the threading package used for the build.  This can either be a
+   single package name, or a semicolon separated sequence of sdk:package pairs.
+   Valid package names are 'pthreads', 'darwin', 'linux', 'win32', 'c11', 'none'
+   or the empty string for the SDK default.")
+
 #
 # End of user-configurable options.
 #
@@ -825,6 +821,32 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_SIMULATE_ID}" STREQU
   set(SWIFT_COMPILER_IS_MSVC_LIKE TRUE)
 endif()
 
+#
+# Display a message if the threading package has been overridden
+#
+
+if(SWIFT_THREADING_PACKAGE)
+  message(STATUS "")
+  message(STATUS "Threading package override enabled")
+  foreach(elt ${SWIFT_THREADING_PACKAGE})
+    string(REPLACE ":" ";" elt_list "${elt}")
+    list(LENGTH elt_list elt_list_len)
+    if(elt_list_len EQUAL 1)
+      set(elt_sdk "Global")
+      list(GET elt_list 0 elt_package)
+    elseif(elt_list_len EQUAL 2)
+      list(GET elt_list 0 elt_sdk)
+      list(GET elt_list 1 elt_package)
+      string(TOUPPER "${elt_sdk}" elt_sdk)
+    else()
+      message(FATAL_ERROR "Bad threading override \"${elt}\" - SWIFT_THREADING_PACKAGE must be a semicolon separated list of package or sdk:package pairs.")
+    endif()
+    string(TOLOWER "${elt_package}" elt_package)
+    message(STATUS "  ${elt_sdk}: ${elt_package}")
+  endforeach()
+  message(STATUS "")
+endif()
+
 #
 # Configure SDKs.
 #
@@ -1059,7 +1081,6 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
   message(STATUS "  Leak Detection Checker Entrypoints: ${SWIFT_RUNTIME_ENABLE_LEAK_CHECKER}")
   message(STATUS "")
 
-  message(STATUS "Threading Package:                  ${SWIFT_THREADING_PACKAGE}")
   message(STATUS "Differentiable Programming Support: ${SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING}")
   message(STATUS "Concurrency Support:                ${SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY}")
   message(STATUS "Distributed Support:                ${SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED}")

SwiftCompilerSources/CMakeLists.txt

@@ -87,6 +87,10 @@ function(add_swift_compiler_modules_library name)
     list(APPEND swift_compile_options "-O" "-cross-module-optimization")
   endif()
 
+  if(NOT SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT)
+    list(APPEND swift_compile_options "-Xfrontend" "-disable-legacy-type-info")
+  endif()
+
   get_bootstrapping_path(build_dir ${CMAKE_CURRENT_BINARY_DIR} "${ALS_BOOTSTRAPPING}")
 
   set(sdk_option "")
@@ -267,7 +271,7 @@ else()
         list(APPEND b1_deps copy-libstdcxx-modulemap-bootstrapping1 copy-libstdcxx-header-bootstrapping1)
       endif()
     endif()
-    if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
+    if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS AND SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT)
       set(platform ${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR})
       set(compatibility_libs
           "swiftCompatibility50-${platform}"

SwiftCompilerSources/Sources/AST/DiagnosticEngine.swift

@@ -81,7 +81,7 @@ public struct DiagnosticEngine {
                        fixIts: [DiagnosticFixIt] = []) {
 
     let bridgedSourceLoc: swift.SourceLoc = position.bridged
-    let bridgedHighlightRange: BridgedCharSourceRange = highlight.bridged
+    let bridgedHighlightRange: swift.CharSourceRange = highlight.bridged
     var bridgedArgs: [BridgedDiagnosticArgument] = []
     var bridgedFixIts: [BridgedDiagnosticFixIt] = []
 

SwiftCompilerSources/Sources/Basic/SourceLoc.swift

@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import ASTBridging
+
 public struct SourceLoc {
   /// Points into a source file.
   let locationInFile: UnsafePointer<UInt8>
@@ -47,27 +49,27 @@ extension Optional where Wrapped == SourceLoc {
 
 public struct CharSourceRange {
   private let start: SourceLoc
-  private let byteLength: Int
+  private let byteLength: UInt32
 
-  public init(start: SourceLoc, byteLength: Int) {
+  public init(start: SourceLoc, byteLength: UInt32) {
     self.start = start
     self.byteLength = byteLength
   }
 
-  public init?(bridged: BridgedCharSourceRange) {
-    guard let start = SourceLoc(bridged: bridged.start) else {
+  public init?(bridged: swift.CharSourceRange) {
+    guard let start = SourceLoc(bridged: bridged.getStart()) else {
       return nil
     }
-    self.init(start: start, byteLength: bridged.byteLength)
+    self.init(start: start, byteLength: bridged.getByteLength())
   }
 
-  public var bridged: BridgedCharSourceRange {
-    .init(start: start.bridged, byteLength: byteLength)
+  public var bridged: swift.CharSourceRange {
+    .init(start.bridged, byteLength)
   }
 }
 
 extension Optional where Wrapped == CharSourceRange {
-  public var bridged: BridgedCharSourceRange {
-    self?.bridged ?? .init(start: .init(), byteLength: 0)
+  public var bridged: swift.CharSourceRange {
+    self?.bridged ?? .init(.init(), 0)
   }
 }

SwiftCompilerSources/Sources/Basic/Utils.swift

@@ -46,12 +46,6 @@ extension BridgedStringRef {
     let buffer = UnsafeBufferPointer<UInt8>(start: data, count: Int(length))
     return String(decoding: buffer, as: UTF8.self)
   }
-
-  public func takeString() -> String {
-    let str = string
-    freeBridgedStringRef(self)
-    return str
-  }
 }
 
 extension String {

SwiftCompilerSources/Sources/Optimizer/Analysis/AliasAnalysis.swift

@@ -45,19 +45,19 @@ struct AliasAnalysis {
   }
 
   /// Returns the correct path for address-alias functions.
-  static func getPtrOrAddressPath(for value: Value) -> EscapeInfo.Path {
+  static func getPtrOrAddressPath(for value: Value) -> SmallProjectionPath {
     let ty = value.type
     if ty.isAddress {
       // This is the regular case: the path selects any sub-fields of an address.
-      return EscapeInfo.Path(.anyValueFields)
+      return SmallProjectionPath(.anyValueFields)
     }
     // Some optimizations use the address-alias APIs with non-address SIL values.
     // TODO: this is non-intuitive and we should eliminate those API uses.
     if ty.isClass {
     // If the value is a (non-address) reference it means: all addresses within the class instance.
-      return EscapeInfo.Path(.anyValueFields).push(.anyClassField)
+      return SmallProjectionPath(.anyValueFields).push(.anyClassField)
     }
     // Any other non-address value means: all addresses of any referenced class instances within the value.
-    return EscapeInfo.Path(.anyValueFields).push(.anyClassField).push(.anyValueFields)
+    return SmallProjectionPath(.anyValueFields).push(.anyClassField).push(.anyValueFields)
   }
 }