Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

Runtimes/Supplemental/Volatile/CMakeLists.txt

@@ -65,7 +65,6 @@ option(${PROJECT_NAME}_ENABLE_PRESPECIALIZATION "Enable generic metadata prespec
 add_compile_options(
   $<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>
   $<$<COMPILE_LANGUAGE:Swift>:-nostdlibimport>
-  $<$<COMPILE_LANGUAGE:Swift>:-enable-builtin-module>
   $<$<COMPILE_LANGUAGE:Swift>:-strict-memory-safety>
   "$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>"
   "$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>")
@@ -75,7 +74,7 @@ add_compile_options(
 # LNK4217: symbol 'symbol' defined in 'filename_1.obj' is imported by 'filename_2.obj' in function 'function'
 #
 # We cannot selectively filter the linker warnings as we do not use the MSVC
-# frontned and `clang-cl` (and `clang`) currently do not support `/WX:nnnn`. As
+# frontend and `clang-cl` (and `clang`) currently do not support `/WX:nnnn`. As
 # a compromise, treat all linker warnings as errors.
 add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
 

utils/build.ps1

@@ -1678,8 +1678,10 @@ function Build-CMakeProject {
 
           $ArgWithForwardSlashes = $Arg.Replace("\", "/")
           if ($ArgWithForwardSlashes.Contains(" ")) {
-            # Quote and escape the quote so it makes it through
-            $Value += "\""$ArgWithForwardSlashes\"""
+            # Escape the quote so it makes it through. PowerShell 5 and Core
+            # handle quotes differently, so we need to check the version.
+            $quote = if ($PSEdition  -eq "Core") { '"' } else { '\"' }
+            $Value += "$quote$ArgWithForwardSlashes$quote"
           } else {
             $Value += $ArgWithForwardSlashes
           }

validation-test/Sema/type_checker_perf/fast/simd_scalar_multiple.swift.gyb

@@ -2,8 +2,9 @@
 
 // REQUIRES: asserts,no_asan
 
-// Flaky is some simulator configurations
+// Flaky is some configurations including simulators
 // REQUIRES: OS=macosx
+// REQUIRES: CPU=arm64 || CPU=arm64e
 
 func f(c: Float, a: SIMD2<Float>) -> SIMD2<Float> {
   return (c * a)