Merge pull request #5038 from swiftwasm/katei/merge-release-5.7-2022-11-03

Merge release/5.7 2022-11-03

Author: kateinoigakukun

SwiftCompilerSources/CMakeLists.txt

@@ -76,6 +76,9 @@ function(add_swift_compiler_modules_library name)
       "-Xfrontend" "-validate-tbd-against-ir=none"
       "-Xfrontend" "-enable-cxx-interop"
       "-Xcc" "-UIBOutlet" "-Xcc" "-UIBAction" "-Xcc" "-UIBInspectable")
+  if (NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
+    list(APPEND swift_compile_options "-Xfrontend" "-disable-implicit-string-processing-module-import")
+  endif()
 
   if(CMAKE_BUILD_TYPE STREQUAL Debug)
     list(APPEND swift_compile_options "-g")

lib/Frontend/CompilerInvocation.cpp

@@ -515,6 +515,8 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     // forward slash regex `/.../`.
     if (!Opts.EnableExperimentalStringProcessing)
       Opts.EnableBareSlashRegexLiterals = false;
+  } else {
+    Opts.EnableExperimentalStringProcessing = true;
   }
 
   Opts.DisableAvailabilityChecking |=

lib/Frontend/Frontend.cpp

@@ -794,7 +794,9 @@ bool CompilerInvocation::shouldImportSwiftConcurrency() const {
 
 bool CompilerInvocation::shouldImportSwiftStringProcessing() const {
   return getLangOptions().EnableExperimentalStringProcessing &&
-      !getLangOptions().DisableImplicitStringProcessingModuleImport;
+      !getLangOptions().DisableImplicitStringProcessingModuleImport &&
+      getFrontendOptions().InputMode !=
+        FrontendOptions::ParseInputMode::SwiftModuleInterface;
 }
 
 /// Implicitly import the SwiftOnoneSupport module in non-optimized

lib/IRGen/Outlining.cpp

@@ -209,6 +209,12 @@ static bool canUseValueWitnessForValueOp(IRGenModule &IGM, SILType T) {
   if (!IGM.getSILModule().isTypeMetadataForLayoutAccessible(T))
     return false;
 
+  // It is not a good code size trade-off to instantiate a metatype for
+  // existentials, and also does not back-deploy gracefully in the case of
+  // constrained protocols.
+  if (T.getASTType()->isExistentialType())
+    return false;
+
   if (needsSpecialOwnershipHandling(T))
     return false;
   if (T.getASTType()->hasDynamicSelfType())

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -1766,6 +1766,12 @@ function(add_swift_target_library name)
                       "-Xfrontend;-disable-implicit-distributed-module-import")
   endif()
 
+  # Turn off implicit import of _StringProcessing when building libraries
+  if(SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING)
+    list(APPEND SWIFTLIB_SWIFT_COMPILE_FLAGS
+                      "-Xfrontend;-disable-implicit-string-processing-module-import")
+  endif()
+
   if(SWIFTLIB_IS_STDLIB AND SWIFT_STDLIB_ENABLE_PRESPECIALIZATION)
     list(APPEND SWIFTLIB_SWIFT_COMPILE_FLAGS "-Xfrontend;-prespecialize-generic-metadata")
   endif()

stdlib/public/BackDeployConcurrency/CMakeLists.txt

@@ -29,6 +29,10 @@ list(REMOVE_ITEM SWIFT_SDK_IOS_SIMULATOR_ARCHITECTURES "i386")
 list(REMOVE_ITEM SWIFT_SDK_IOS_ARCHITECTURES "arm64e")
 list(REMOVE_ITEM SWIFT_SDK_OSX_ARCHITECTURES "arm64e")
 
+# Don't build the libraries for 64-bit watchOS targets;
+# there is no back-deployment to them.
+list(REMOVE_ITEM SWIFT_SDK_WATCHOS_ARCHITECTURES "arm64" "arm64e")
+
 # The back-deployed library can only be shared.
 list(APPEND SWIFT_STDLIB_LIBRARY_BUILD_TYPES SHARED)
 

stdlib/public/SwiftShims/UnicodeData.h

@@ -108,7 +108,7 @@ SWIFT_RUNTIME_STDLIB_INTERNAL
 __swift_uint8_t _swift_stdlib_getGeneralCategory(__swift_uint32_t scalar);
 
 SWIFT_RUNTIME_STDLIB_INTERNAL
-__swift_uint8_t _swift_stdlib_getScript(__swift_uint32_t scalar);
+__swift_uint8_t _swiftCore_stdlib_getScript(__swift_uint32_t scalar);
 
 SWIFT_RUNTIME_STDLIB_INTERNAL
 const __swift_uint8_t *_swiftCore_stdlib_getScriptExtensions(

stdlib/public/core/UnicodeSPI.swift

@@ -134,7 +134,7 @@ extension Unicode.Scalar.Properties {
   @_spi(_Unicode)
   @available(SwiftStdlib 5.7, *)
   public var _script: UInt8 {
-    let rawValue = _swift_stdlib_getScript(_scalar.value)
+    let rawValue = _swiftCore_stdlib_getScript(_scalar.value)
 
     _internalInvariant(rawValue != .max, "Unknown script rawValue")
 

stdlib/public/stubs/Unicode/UnicodeScalarProps.cpp

@@ -432,7 +432,7 @@ __swift_uint8_t _swift_stdlib_getGeneralCategory(__swift_uint32_t scalar) {
 }
 
 SWIFT_RUNTIME_STDLIB_INTERNAL
-__swift_uint8_t _swift_stdlib_getScript(__swift_uint32_t scalar) {
+__swift_uint8_t _swiftCore_stdlib_getScript(__swift_uint32_t scalar) {
 #if !SWIFT_STDLIB_ENABLE_UNICODE_DATA
   swift::swift_abortDisabledUnicodeSupport();
 #else

test/AutoDiff/validation-test/differentiable_protocol_requirements.swift

@@ -1,6 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
-
+// REQUIRES: rdar89860761
 // Disabled due to test failure with `-O`: SR-13250.
 // SR-13250 is tracking the fix for compiling this test with optimizations.
 // XFAIL: swift_test_mode_optimize