Merge pull request #3802 from swiftwasm/release/5.5

[pull] swiftwasm-release/5.5 from release/5.5

Author: pull[bot]

lib/Frontend/CompilerInvocation.cpp

@@ -1830,6 +1830,15 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
       Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
                      A->getAsString(Args), A->getValue());
     }
+  } else if (Triple.isWatchOS() && !Triple.isSimulatorEnvironment()) {
+    // watchOS does not support auto async frame pointers due to bitcode, so
+    // silently override "auto" to "never" when back-deploying. This approach
+    // sacrifies async backtraces when back-deploying but prevents crashes in
+    // older tools that cannot handle the async frame bit in the frame pointer.
+    unsigned major, minor, micro;
+    Triple.getWatchOSVersion(major, minor, micro);
+    if (major < 8)
+      Opts.SwiftAsyncFramePointer = SwiftAsyncFramePointerKind::Never;
   }
 
   return false;

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -1205,7 +1205,9 @@ function(_add_swift_target_library_single target name)
   set(PLIST_INFO_PLIST "Info.plist" CACHE STRING "Plist name")
   if("${SWIFTLIB_SINGLE_SDK}" IN_LIST SWIFT_APPLE_PLATFORMS AND SWIFTLIB_SINGLE_IS_STDLIB)
     set(PLIST_INFO_NAME ${name})
-    set(PLIST_INFO_UTI "com.apple.dt.runtime.${name}")
+
+    # Underscores aren't permitted in the bundle identifier.
+    string(REPLACE "_" "" PLIST_INFO_UTI "com.apple.dt.runtime.${name}")
     set(PLIST_INFO_VERSION "${SWIFT_VERSION}")
     if (SWIFT_COMPILER_VERSION)
       set(PLIST_INFO_BUILD_VERSION

stdlib/public/Concurrency/Task.cpp

@@ -37,8 +37,19 @@
 #endif
 
 #if defined(SWIFT_CONCURRENCY_BACK_DEPLOYMENT)
+#include <Availability.h>
+#include <TargetConditionals.h>
+#if TARGET_OS_WATCH
+// Bitcode compilation for the watch device precludes defining the following asm
+// symbols, so we don't use them... but simulators are okay.
+#if TARGET_OS_SIMULATOR
 asm("\n .globl _swift_async_extendedFramePointerFlags" \
     "\n _swift_async_extendedFramePointerFlags = 0x0");
+#endif
+#else
+asm("\n .globl _swift_async_extendedFramePointerFlags" \
+    "\n _swift_async_extendedFramePointerFlags = 0x0");
+#endif
 #else
 #ifdef __APPLE__
 #if __POINTER_WIDTH__ == 64

test/IRGen/swift_async_extended_frame_info_watchos.swift

@@ -0,0 +1,20 @@
+// RUN: %target-swift-frontend -disable-availability-checking -target arm64_32-apple-watchos7 %s -S | %FileCheck  -check-prefix=NEVER %s
+// RUN: %target-swift-frontend -disable-availability-checking -target arm64_32-apple-watchos8 %s -S | %FileCheck  -check-prefix=ALWAYS %s
+// RUN: %target-swift-frontend -disable-availability-checking -target arm64_32-apple-watchos7  -swift-async-frame-pointer=always %s -S | %FileCheck  -check-prefix=ALWAYS %s
+// RUN: %target-swift-frontend -disable-availability-checking -target arm64_32-apple-watchos7  -swift-async-frame-pointer=never %s -S | %FileCheck  -check-prefix=NEVER %s
+// RUN: %target-swift-frontend -disable-availability-checking -target arm64_32-apple-watchos7  -swift-async-frame-pointer=auto %s -S | %FileCheck  -check-prefix=AUTO %s
+
+// REQUIRES: OS=watchos
+// REQUIRES: CPU=armv7k || CPU=arm64_32
+
+public func someAsyncFunction() async {
+}
+
+// AUTO: swift_async_extendedFramePointerFlags
+
+// ALWAYS-NOT: swift_async_extendedFramePointerFlags
+// ALWAYS: 0x1000000000000000
+// ALWAYS-NOT: swift_async_extendedFramePointerFlags
+
+// NEVER-NOT: swift_async_extendedFramePointerFlags
+// NEVER-NOT: 0x1000000000000000

utils/swift_build_support/swift_build_support/products/backdeployconcurrency.py

@@ -84,6 +84,14 @@ def build(self, host_target):
         self.cmake_options.define('SWIFT_HOST_VARIANT_ARCH:STRING', arch)
         self.cmake_options.define('BUILD_STANDALONE:BOOL', True)
 
+        # Propagate version information
+        if self.args.swift_user_visible_version is not None:
+            self.cmake_options.define('SWIFT_VERSION',
+                                      str(self.args.swift_user_visible_version))
+        if self.args.swift_compiler_version is not None:
+            self.cmake_options.define('SWIFT_COMPILER_VERSION',
+                                      str(self.args.swift_compiler_version))
+
         # Only install the "stdlib" component, which contains the concurrency
         # module.
         self.cmake_options.define('SWIFT_INSTALL_COMPONENTS:STRING', 'back-deployment')