Merge pull request #73232 from gottesmm/release/6.0-misc-cherry-picks

[6.0] Two small cherry-picks to improve build stability

Author: gottesmm

stdlib/cmake/modules/SwiftSource.cmake

@@ -856,7 +856,10 @@ function(_compile_swift_files
   if(SWIFT_INCLUDE_TOOLS AND NOT BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE")
     # Depend on the binary itself, in addition to the symlink, unless
     # cross-compiling the compiler.
-    set(swift_compiler_tool_dep "swift-frontend${target_suffix}")
+    list(APPEND swift_compiler_tool_dep "swift-frontend${target_suffix}")
+
+    # If we aren't cross compiling, also depend on SwiftMacros.
+    list(APPEND swift_compiler_tool_dep SwiftMacros)
   endif()
 
   # If there are more than one output files, we assume that they are specified

test/Concurrency/isolated_parameters.swift

@@ -1,6 +1,7 @@
 // RUN: %target-swift-frontend  -disable-availability-checking -strict-concurrency=complete %s -emit-sil -o /dev/null -verify -verify-additional-prefix complete- -disable-region-based-isolation-with-strict-concurrency
 // RUN: %target-swift-frontend  -disable-availability-checking -strict-concurrency=complete %s -emit-sil -o /dev/null -verify
 
+// REQUIRES: asserts
 // REQUIRES: concurrency
 // REQUIRES: swift_swift_parser