Merge branch 'main' of github.com:apple/swift into HEAD

Author: compnerd

CHANGELOG.md

@@ -3,6 +3,18 @@
 > **Note**\
 > This is in reverse chronological order, so newer entries are added to the top.
 
+## Swift 5.9.2
+
+* [SE-0407][]:
+
+  Member macros can specify a list of protocols via the `conformances` argument to the macro role. The macro implementation will be provided with those protocols that are listed but have not already been implemented by the type to which the member macro is attached, in the same manner as extension macros.
+
+   ```swift
+   @attached(member, conformances: Decodable, Encodable, names: named(init(from:), encode(to:)))
+@attached(extension, conformances: Decodable, Encodable, names: named(init(from:), encode(to:)))
+macro Codable() = #externalMacro(module: "MyMacros", type: "CodableMacro")
+   ```
+
 ## Swift 5.9
 
 * [SE-0382][], [SE-0389][], [SE-0394][], [SE-0397][]:
@@ -9833,6 +9845,7 @@ using the `.dynamicType` member to retrieve the type of an expression should mig
 [SE-0389]: https://github.com/apple/swift-evolution/blob/main/proposals/0389-attached-macros.md
 [SE-0394]: https://github.com/apple/swift-evolution/blob/main/proposals/0394-swiftpm-expression-macros.md
 [SE-0397]: https://github.com/apple/swift-evolution/blob/main/proposals/0397-freestanding-declaration-macros.md
+[SE-0407]: https://github.com/apple/swift-evolution/blob/main/proposals/0407-member-macro-conformances.md
 [#64927]: <https://github.com/apple/swift/issues/64927>
 [#42697]: <https://github.com/apple/swift/issues/42697>
 [#42728]: <https://github.com/apple/swift/issues/42728>

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/SimplifyBranch.swift

@@ -70,8 +70,10 @@ private extension BranchInst {
       }
       parentBB.moveAllInstructions(toBeginOf: targetBB, context)
       parentBB.moveAllArguments(to: targetBB, context)
+      context.erase(block: parentBB)
     } else {
       targetBB.moveAllInstructions(toEndOf: parentBB, context)
+      context.erase(block: targetBB)
     }
   }
 }

SwiftCompilerSources/Sources/Optimizer/ModulePasses/MandatoryPerformanceOptimizations.swift

@@ -30,8 +30,14 @@ let mandatoryPerformanceOptimizations = ModulePass(name: "mandatory-performance-
   (moduleContext: ModulePassContext) in
 
   var worklist = FunctionWorklist()
-  worklist.addAllPerformanceAnnotatedFunctions(of: moduleContext)
-  worklist.addAllAnnotatedGlobalInitOnceFunctions(of: moduleContext)
+  // For embedded Swift, optimize all the functions (there cannot be any
+  // generics, type metadata, etc.)
+  if moduleContext.options.enableEmbeddedSwift {
+    worklist.addAllNonGenericFunctions(of: moduleContext)
+  } else {
+    worklist.addAllPerformanceAnnotatedFunctions(of: moduleContext)
+    worklist.addAllAnnotatedGlobalInitOnceFunctions(of: moduleContext)
+  }
 
   optimizeFunctionsTopDown(using: &worklist, moduleContext)
 }
@@ -305,6 +311,13 @@ fileprivate struct FunctionWorklist {
     }
   }
 
+  mutating func addAllNonGenericFunctions(of moduleContext: ModulePassContext) {
+    for f in moduleContext.functions where !f.isGenericFunction {
+      pushIfNotVisited(f)
+    }
+    return
+  }
+
   mutating func addAllAnnotatedGlobalInitOnceFunctions(of moduleContext: ModulePassContext) {
     for f in moduleContext.functions where f.isGlobalInitOnceFunction {
       if let global = f.getInitializedGlobal(),

SwiftCompilerSources/Sources/Optimizer/PassManager/Context.swift

@@ -71,6 +71,10 @@ extension MutatingContext {
     erase(instruction: inst)
   }
 
+  func erase(block: BasicBlock) {
+    _bridged.eraseBlock(block.bridged)
+  }
+
   func tryOptimizeApplyOfPartialApply(closure: PartialApplyInst) -> Bool {
     if _bridged.tryOptimizeApplyOfPartialApply(closure.bridged) {
       notifyInstructionsChanged()
@@ -227,10 +231,6 @@ struct FunctionPassContext : MutatingContext {
     }
   }
 
-  func erase(block: BasicBlock) {
-    _bridged.eraseBlock(block.bridged)
-  }
-
   func modifyEffects(in function: Function, _ body: (inout FunctionEffects) -> ()) {
     notifyEffectsChanged()
     function._modifyEffects(body)

SwiftCompilerSources/Sources/Optimizer/PassManager/Options.swift

@@ -28,6 +28,10 @@ struct Options {
     _bridged.enableSimplificationFor(inst.bridged)
   }
 
+  var enableEmbeddedSwift: Bool {
+    _bridged.enableEmbeddedSwift()
+  }
+
   enum AssertConfiguration {
     case enabled
     case disabled

SwiftCompilerSources/Sources/SIL/Function.swift

@@ -137,6 +137,8 @@ final public class Function : CustomStringConvertible, HasShortDescription, Hash
   /// It's called from a `[global_init]` function via a `builtin "once"`.
   public var isGlobalInitOnceFunction: Bool { bridged.isGlobalInitOnceFunction() }
 
+  public var isGenericFunction: Bool { bridged.isGenericFunction() }
+
   /// Kinds of effect attributes which can be defined for a Swift function.
   public enum EffectAttribute {
     /// No effect attribute is specified.

cmake/modules/AddPureSwift.cmake

@@ -269,7 +269,8 @@ function(add_pure_swift_host_tool name)
 
   # Option handling
   set(options)
-  set(single_parameter_options)
+  set(single_parameter_options
+    SWIFT_COMPONENT)
   set(multiple_parameter_options
         DEPENDENCIES
         SWIFT_DEPENDENCIES)
@@ -341,6 +342,18 @@ function(add_pure_swift_host_tool name)
       COMMAND "${CMAKE_COMMAND}" -E touch "${CMAKE_CURRENT_BINARY_DIR}/${name}.swiftmodule"
       COMMAND_EXPAND_LISTS
       COMMENT "Update mtime of executable outputs workaround")
-  # Export this target.
-  set_property(GLOBAL APPEND PROPERTY SWIFT_EXPORTS ${name})
+
+  if(NOT APSHT_SWIFT_COMPONENT STREQUAL no_component)
+    add_dependencies(${APSHT_SWIFT_COMPONENT} ${name})
+    swift_install_in_component(TARGETS ${name}
+      COMPONENT ${APSHT_SWIFT_COMPONENT}
+      RUNTIME DESTINATION bin)
+    swift_is_installing_component(${APSHT_SWIFT_COMPONENT} is_installing)
+  endif()
+
+  if(NOT is_installing)
+    set_property(GLOBAL APPEND PROPERTY SWIFT_BUILDTREE_EXPORTS ${name})
+  else()
+    set_property(GLOBAL APPEND PROPERTY SWIFT_EXPORTS ${name})
+  endif()
 endfunction()

cmake/modules/AddSwift.cmake

@@ -573,6 +573,9 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
     else()
       message(FATAL_ERROR "Unknown BOOTSTRAPPING_MODE '${ASRLF_BOOTSTRAPPING_MODE}'")
     endif()
+  else()
+    target_link_directories(${target} PRIVATE
+      ${SWIFT_PATH_TO_SWIFT_SDK}/usr/lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}/${SWIFT_HOST_VARIANT_ARCH})
   endif()
 
   if(SWIFT_SWIFT_PARSER)

cmake/modules/AddSwiftUnittests.cmake

@@ -111,10 +111,31 @@ function(add_swift_unittest test_dirname)
     endif()
   endif()
 
+  file(RELATIVE_PATH relative_lib_path "${CMAKE_CURRENT_BINARY_DIR}" "${SWIFT_LIBRARY_OUTPUT_INTDIR}")
+
+  if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
+    set_property(
+      TARGET ${test_dirname}
+      APPEND PROPERTY INSTALL_RPATH "@executable_path/${relative_lib_path}")
+  elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
+    set_property(
+      TARGET ${test_dirname}
+      APPEND PROPERTY INSTALL_RPATH "$ORIGIN/${relative_lib_path}")
+  endif()
+
   if (SWIFT_SWIFT_PARSER AND NOT ASU_IS_TARGET_TEST)
     # Link to stdlib the compiler uses.
-    _add_swift_runtime_link_flags(${test_dirname} "../../lib" "")
-    set_property(TARGET ${test_dirname} PROPERTY BUILD_WITH_INSTALL_RPATH OFF)
+    _add_swift_runtime_link_flags(${test_dirname} "${relative_lib_path}" "")
+
+    if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
+      set_property(
+        TARGET ${test_dirname}
+        APPEND PROPERTY INSTALL_RPATH "@executable_path/${relative_lib_path}/swift/host")
+    elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
+      set_property(
+        TARGET ${test_dirname}
+        APPEND PROPERTY INSTALL_RPATH "$ORIGIN/${relative_lib_path}/swift/host")
+    endif()
   endif()
 endfunction()
 

cmake/modules/SwiftImplicitImport.cmake

@@ -3,6 +3,8 @@ function(swift_supports_implicit_module module_name out_var)
   file(WRITE "${CMAKE_BINARY_DIR}/tmp/empty-check-${module_name}.swift" "")
   execute_process(
     COMMAND
+      ${CMAKE_COMMAND}
+      -E env --unset=SWIFT_LOADED_MODULE_TRACE_FILE
       "${CMAKE_Swift_COMPILER}"
       -Xfrontend -disable-implicit-${module_name}-module-import
       -Xfrontend -parse-stdlib