peachsim 0.1.2209 → 0.1.2210

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peachsim",
-  "version": "0.1.2209",
+  "version": "0.1.2210",
   "description": "Vite and Metro plugins, testing drivers, and SDK exports for peach.",
   "author": "Tamagui LLC",
   "license": "SEE LICENSE IN LICENSE",

package/sdk/ios/System/Library/Frameworks/QuartzCore.framework/Headers/CoreAnimation.h

@@ -21,3 +21,5 @@
 #import <QuartzCore/CATextLayer.h>
 #import <QuartzCore/CATiledLayer.h>
 #import <QuartzCore/CATransformLayer.h>
+#import <QuartzCore/CAEDRMetadata.h>
+#import <QuartzCore/CAMetalLayer.h>

package/sdk/ios/System/Library/Frameworks/UIKit.framework/Headers/UIKit.apinotes

@@ -1080,6 +1080,27 @@ Classes:
   - Selector: 'imageByRemovingVariant'
     MethodKind: Instance
     SwiftName: 'removingVariant()'
+  - Selector: 'initWithCGImage:scale:orientation:'
+    MethodKind: Instance
+    Availability: nonswift
+    AvailabilityMsg: 'UIKitCore declares the Swift initializer with UIImage.Orientation'
+  - Selector: 'initWithCIImage:scale:orientation:'
+    MethodKind: Instance
+    Availability: nonswift
+    AvailabilityMsg: 'UIKitCore declares the Swift initializer with UIImage.Orientation'
+  - Selector: 'imageWithCGImage:scale:orientation:'
+    MethodKind: Class
+    Availability: nonswift
+    AvailabilityMsg: 'UIKitCore declares the Swift initializer with UIImage.Orientation'
+  - Selector: 'imageWithCIImage:scale:orientation:'
+    MethodKind: Class
+    Availability: nonswift
+    AvailabilityMsg: 'UIKitCore declares the Swift initializer with UIImage.Orientation'
+  Properties:
+  - Name: imageOrientation
+    PropertyKind: Instance
+    Availability: nonswift
+    AvailabilityMsg: 'UIKitCore declares imageOrientation with UIImage.Orientation'
 - Name: UIImageConfiguration
 - Name: UIImageSymbolConfiguration
   Methods:

package/sdk/ios/usr/lib/swift/Combine.swiftmodule/arm64-apple-ios-simulator.swiftinterface

@@ -0,0 +1,18 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -target arm64-apple-ios16.0-simulator -enable-objc-interop -enable-library-evolution -module-name Combine
+import Swift
+import _Concurrency
+public protocol Publisher {
+  associatedtype Output
+  associatedtype Failure : Swift.Error
+}
+final public class ObservableObjectPublisher : Combine.Publisher {
+  public typealias Output = Swift.Void
+  public typealias Failure = Swift.Never
+  public init()
+  public func send()
+}
+public protocol ObservableObject : AnyObject {
+  associatedtype ObjectWillChangePublisher : Combine.Publisher = Combine.ObservableObjectPublisher where Self.ObjectWillChangePublisher.Failure == Swift.Never
+  var objectWillChange: Self.ObjectWillChangePublisher { get }
+}

package/sdk/ios/usr/lib/swift/Foundation.swiftmodule/arm64-apple-ios-simulator.swiftinterface

@@ -3,6 +3,7 @@
 @_exported import Foundation
 @_exported import ObjectiveC
 @_exported import CoreGraphics
+@_exported import Combine
 import Swift
 import _Concurrency
 public struct URL : Swift.Hashable, Swift.Codable, Swift.Sendable, Swift.CustomStringConvertible {

package/sdk/ios/usr/lib/swift/SwiftUI.swiftmodule/arm64-apple-ios-simulator.swiftinterface

@@ -23,3 +23,22 @@ extension SwiftUI.UIViewControllerRepresentable {
 extension SwiftUI.UIViewControllerRepresentable where Self.Coordinator == Swift.Void {
   @_Concurrency.MainActor @preconcurrency public func makeCoordinator() -> Swift.Void
 }
+@_Concurrency.MainActor @preconcurrency public protocol UIViewRepresentable : SwiftUICore.View where Self.Body == Swift.Never {
+  associatedtype UIViewType : UIKit.UIView
+  @_Concurrency.MainActor @preconcurrency func makeUIView(context: Self.Context) -> Self.UIViewType
+  @_Concurrency.MainActor @preconcurrency func updateUIView(_ uiView: Self.UIViewType, context: Self.Context)
+  @_Concurrency.MainActor @preconcurrency static func dismantleUIView(_ uiView: Self.UIViewType, coordinator: Self.Coordinator)
+  associatedtype Coordinator = Swift.Void
+  @_Concurrency.MainActor @preconcurrency func makeCoordinator() -> Self.Coordinator
+  typealias Context = SwiftUI.UIViewRepresentableContext<Self>
+}
+@_Concurrency.MainActor @preconcurrency public struct UIViewRepresentableContext<Representable> where Representable : SwiftUI.UIViewRepresentable {
+  @_Concurrency.MainActor @preconcurrency public let coordinator: Representable.Coordinator
+}
+extension SwiftUI.UIViewRepresentable {
+  @_Concurrency.MainActor @preconcurrency public var body: Swift.Never { get }
+  @_Concurrency.MainActor @preconcurrency public static func dismantleUIView(_ uiView: Self.UIViewType, coordinator: Self.Coordinator)
+}
+extension SwiftUI.UIViewRepresentable where Self.Coordinator == Swift.Void {
+  @_Concurrency.MainActor @preconcurrency public func makeCoordinator() -> Swift.Void
+}

package/sdk/ios/usr/lib/swift/SwiftUICore.swiftmodule/arm64-apple-ios-simulator.swiftinterface

@@ -14,3 +14,7 @@ public struct Binding<Value> {}
 @resultBuilder public struct ViewBuilder {
   public static func buildBlock<Content>(_ content: Content) -> Content where Content : SwiftUICore.View
 }
+public struct AnyView : SwiftUICore.View {
+  public typealias Body = Swift.Never
+  public var body: Swift.Never { get }
+}

package/sdk/ios/usr/lib/swift/UIKit.swiftmodule/arm64-apple-ios-simulator.swiftinterface

@@ -2,6 +2,7 @@
 // swift-module-flags: -target arm64-apple-ios16.0-simulator -enable-objc-interop -enable-library-evolution -module-name UIKit
 @_exported import UIKit
 import Swift
+import _Concurrency
 extension UIKit.UIApplication {
   public typealias State = UIKit.UIApplicationState
 }
@@ -11,6 +12,9 @@ extension UIKit.UIWindow {
 extension UIKit.UIDevice {
   public typealias BatteryState = UIKit.UIDeviceBatteryState
 }
+extension ObjectiveC.NSObject {
+  @objc @_Concurrency.MainActor @preconcurrency dynamic open var accessibilityElements: [Any]? { @objc get @objc set }
+}
 extension UIKit.NSLayoutConstraint {
   public typealias Relation = UIKit.NSLayoutRelation
   public typealias Attribute = UIKit.NSLayoutAttribute

package/sdk/ios/wasm/include/pthread.h

@@ -47,6 +47,7 @@ void *pthread_get_stackaddr_np(pthread_t);
 int pthread_threadid_np(pthread_t, __uint64_t * _Nullable);
 struct __darwin_pthread_handler_rec **__peach_darwin_cleanup_stack(void);
 int pthread_cancel(pthread_t) __asm__("__peach_darwin_pthread_cancel");
+void pthread_exit(void * _Nullable) __attribute__((noreturn)) __asm__("__peach_darwin_pthread_exit");
 int pthread_setcancelstate(int , int * _Nullable) __asm__("__peach_darwin_pthread_setcancelstate");
 int pthread_setcanceltype(int , int * _Nullable) __asm__("__peach_darwin_pthread_setcanceltype");
 void pthread_testcancel(void) __asm__("__peach_darwin_pthread_testcancel");

package/sdk/ios/wasm/include/signal.h

@@ -1,6 +1,6 @@
 // darwin's signal.h in place of the installed libc's. functions the installed
 // libc also defines with its own numbering (raise, bsd_signal, psignal) have
-// their own symbols. waiting for a signal needs asynchronous delivery, which
+// their own symbols. waiting for a signal that is not already pending needs asynchronous delivery, which
 // a wasm instance has no source of.
 #ifndef _USER_SIGNAL_H
 #define _USER_SIGNAL_H
@@ -43,7 +43,7 @@ int sigprocmask(int, const sigset_t * __restrict, sigset_t * __restrict);
 int sigrelse(int);
 void (* _Nullable sigset(int, void (* _Nullable)(int)))(int);
 int sigsuspend(const sigset_t *) __PEACH_DARWIN_UNAVAILABLE("Darwin asynchronous signals are not implemented for WebAssembly");
-int sigwait(const sigset_t * __restrict, int * __restrict) __PEACH_DARWIN_UNAVAILABLE("Darwin asynchronous signals are not implemented for WebAssembly");
+int sigwait(const sigset_t * __restrict, int * __restrict);
 #if !defined(_POSIX_C_SOURCE) || _POSIX_C_SOURCE >= 200809L || defined(_DARWIN_C_SOURCE)
 void psignal(int, const char *) __asm__("__peach_darwin_psignal");
 #endif

package/sdk/native-hashes.json

@@ -42,7 +42,7 @@
     {
       "path": "wasm/include/machine/limits.h",
       "nativeSha256": "50345f1ab843fca787a38c552a84177e678d79dab86e714434f94f2546839357",
-      "sha256": "7c944f43a0de8e3b1b19951650fc8ebb98d373094a5d9258cb0e99a9b723f000",
+      "sha256": "f970318bcb9a7e991924f78c075ba48cf99292372088e0adc0daf9018164f839",
       "change": "one __wasm32__ branch before the native #else: arm/limits.h's selection inline, with arm/_limits.h's __DARWIN_CLK_TCK in place of its include and USE_CLANG_LIMITS fixed at 0",
       "reason": "the native selection errors on any architecture but i386, x86_64, arm and arm64. wasm32 takes arm's values, as machine/_types.h does. A modules build on iOS takes the integer limits from clang's limits.h, which includes Darwin's; the wasm view finds Darwin's ahead of clang's, whose builtin module would bring the installed libc's limits with it, so the branch always defines them."
     },
@@ -77,8 +77,8 @@
     {
       "path": "System/Library/Frameworks/Foundation.framework/Headers/Foundation.apinotes",
       "nativeSha256": "025956c54d34391f2c422b736710641a860694436f5b8a34d719ade2d9ed3220",
-      "sha256": "8dc2bc8008ae1d31401458ec776a9c2f356ff6ffdb890bb409bc79b07318b651",
-      "change": "hide NSArray arrayWithObjects:count: from Swift, nest FileManager sync control and URLSession delayed request and multipath enums, import networking singleton and selector names, and hide native members whose Swift implementation supplies the existing typed declaration",
+      "sha256": "f05f7e0edce96ebd5d6c1c5d816b6d5a1c922a2c969ce971748bb10edd3d3ed5",
+      "change": "hide NSArray arrayWithObjects:count: from Swift, nest FileManager sync control and URLSession delayed request and multipath enums, import networking singleton and selector names, hide native members whose Swift implementation supplies the existing typed declaration, and leave unnested the enums of classes Foundation declares in Swift, which declare those nested types themselves",
       "reason": "the Objective-C header owns the networking classes and categories; their Swift implementation must use the native imported names without the obsolete moved-type aliases or duplicate Swift-owned session classes"
     },
     {

package/src/native-static-libraries.ts

@@ -192,6 +192,13 @@ export const NATIVE_STATIC_LIBRARY_RECIPES = [
     recipe: 'a2642115a5eeb04559c9f1daaa4b4cbe4b1c211533b4cc80cb8339a4477af205',
     archive: 'libsksg.a',
   },
+  {
+    name: 'webgpu_dawn',
+    nativeSha256: '95078993275bccc969b1dfa1ad0934cbacc05ae59e8aa2a6cc46ce93e97d4f69',
+    upstream: '3d786993a7ded64c4ebb4884b9b079db9ad0e580',
+    recipe: 'c55468cc976e837ad894133f2231beb7d1ed64633af7b457b8a2610d7df45994',
+    archive: 'libwebgpu_dawn.a',
+  },
 ]
 
 export function nativeStaticLibraryEntry(

package/src/swift-compile.ts

@@ -62,6 +62,7 @@ import {
   SWIFT_OBJC_INTEROP_FLAGS,
   swiftClangImporterFlags,
   swiftObjCModuleMap,
+  swiftSubmoduleImports,
 } from './swift-objc-import'
 import { swiftObjCRuntimeFlags } from './swift-objc-runtime'
 import { iosDeploymentMinimum, objcSdkIntakeFlags } from './swift-objc-standin'
@@ -3832,6 +3833,25 @@ function stripCCode(source: string): string {
   return code
 }
 
+// whether the unit's code under wasm32 takes its own return address, which
+// the WebAssembly backend rejects ("hasn't implemented __builtin_return_address"):
+// native machine code the target has no lowering for, like assembly. branches
+// the native architecture macros guard are not wasm code.
+const wasmMacroEnvironment: SwiftCMacroEnvironment = {
+  ...emptyMacroEnvironment,
+  defines: new Map([
+    ['__wasm__', '1'],
+    ['__wasm32__', '1'],
+    ['__wasi__', '1'],
+  ]),
+}
+export function swiftCTakesReturnAddress(source: string): boolean {
+  if (!source.includes('__builtin_return_address')) return false
+  return /\b__builtin_return_address\s*\(/.test(
+    cActiveCode(stripCCode(source), wasmMacroEnvironment),
+  )
+}
+
 // every name the given sources define. order and conditions are not
 // evaluated: a name defined anywhere makes its guards undecided.
 export function swiftCDefinedNames(sources: Iterable<string>): Set<string> {
@@ -4360,6 +4380,11 @@ export function writeSwiftProject(
         clangImportedModules.add(name)
       }
   }
+  const submoduleImports = swiftSubmoduleImports(
+    Object.entries(input.files).flatMap(([file, contents]) =>
+      file.endsWith('.swift') ? [contents] : [],
+    ),
+  )
   const headerDirectory = path.join(layout.root, '.build', 'peach-cxx-headers')
   const flattenedHeaders = new Set<string>()
   // product header aliases belong to this input. keep emitted Swift headers,
@@ -4906,6 +4931,7 @@ export function writeSwiftProject(
             swiftObjCModuleMap(
               swiftTargetModuleName(target.name),
               roots.map((file) => path.join(layout.root, file)),
+              submoduleImports.get(swiftTargetModuleName(target.name)),
             ))
         if (moduleContents === undefined)
           throw new Error('missing original module map ' + modulemap)
@@ -5295,13 +5321,17 @@ export function writeSwiftProject(
       modulemap,
       originalMap
         ? `extern module ${moduleName} ${JSON.stringify(path.join(layout.root, originalMap))}\nmodule ${moduleName}.Swift {\n  header ${JSON.stringify(path.join(headerDirectory, name + '-Swift.h'))}\n  requires objc\n}\n`
-        : swiftObjCModuleMap(moduleName, [
-            ...(
-              input.nativeTargets?.find((target) => target.name === name)
-                ?.publicHeaders ?? []
-            ).map((header) => path.join(layout.root, header)),
-            path.join(headerDirectory, name + '-Swift.h'),
-          ]),
+        : swiftObjCModuleMap(
+            moduleName,
+            [
+              ...(
+                input.nativeTargets?.find((target) => target.name === name)
+                  ?.publicHeaders ?? []
+              ).map((header) => path.join(layout.root, header)),
+              path.join(headerDirectory, name + '-Swift.h'),
+            ],
+            submoduleImports.get(moduleName),
+          ),
     )
     nativeHeaderFlags.push('-fmodule-map-file=' + modulemap)
   }
@@ -6588,8 +6618,15 @@ async function buildFrameworkProducts(
   const linked = frameworkLinkClosure(scratch, linkedTargets.targets)
   const objects = linked.objects
   if (linked.modules.has('UniformTypeIdentifiers')) {
-    const object = path.join(scratch, 'UniformTypeIdentifiers-NativeConstants.o')
-    if (!existsSync(object)) {
+    const constantsDir = path.join(scratch, 'uniform-type-constants')
+    const constantsStamp = path.join(constantsDir, '.complete')
+    const object = path.join(constantsDir, 'UniformTypeIdentifiers-NativeConstants.o')
+    if (
+      !existsSync(constantsStamp) ||
+      readFileSync(constantsStamp, 'utf8') !== args.frameworkKey
+    ) {
+      rmSync(constantsDir, { recursive: true, force: true })
+      mkdirSync(constantsDir)
       const sdkPaths = swiftSdkPaths(args.moduleRoot, args.toolchainBin)
       compileUniformTypeConstants({
         bin: args.toolchainBin,
@@ -6597,8 +6634,9 @@ async function buildFrameworkProducts(
         darwin: sdkPaths.darwin,
         packageRoot: args.moduleRoot,
         minimum: darwinRecordsMinimum(),
-        out: scratch,
+        out: constantsDir,
       })
+      writeFileSync(constantsStamp, args.frameworkKey)
     }
     objects.push(object)
     linked.owners.set(object, 'UniformTypeIdentifiers')

package/src/swift-host.ts

@@ -83,7 +83,8 @@ import {
   type SwiftPackageGap,
   type SwiftPackages,
 } from './swift-packages'
-import { rasterizePdfFile } from './swift-pdf-raster'
+import { rasterizePdfFile, rasterizeSvgFile } from './swift-pdf-raster'
+import { shippedBinaryDiffers } from './swift-shipped-binaries'
 import {
   packageInputPath,
   readPackageFile as readSwiftSourceFile,
@@ -596,7 +597,7 @@ async function swiftPackages(
   // compiling, or a placeholder package's swift target: each stands in from
   // its public surface.
   const standinArtifact = (binary: SwiftPackageBinary) =>
-    binary.publicHeaders === undefined || binary.assemblySources !== undefined
+    binary.publicHeaders === undefined || binary.unloweredSources !== undefined
   const artifacts = reached.filter(standinArtifact)
   if (entry.moduleRoot && entry.provided && artifacts.length > 0) {
     const resolved = swiftModuleToolchain(entry.moduleRoot)
@@ -618,10 +619,16 @@ async function swiftPackages(
     const cxxArtifacts = reached.filter(standinArtifact)
     const generation = standinGenerationInputs(cxxArtifacts, toolchain, entry.behavior)
     if (cached.standinKey !== generation) {
+      // an archive other than the one peach ships a module for stands in itself
+      const replaced = new Set(
+        cxxArtifacts
+          .filter((binary) => shippedBinaryDiffers(binary.target, binary.checksum))
+          .map((binary) => binary.target),
+      )
       const built = await swiftStandins(
         cxxArtifacts,
         toolchain,
-        entry.provided,
+        new Set([...entry.provided].filter((name) => !replaced.has(name))),
         entry.behavior,
       )
       cached.packages = await resolveSwiftPackagesAsync({
@@ -637,6 +644,9 @@ async function swiftPackages(
             .map((binary) => binary.target)
             .filter((target) => !built.gaps.has(target)),
         ]),
+        standinTargets: new Set(
+          [...replaced].filter((target) => !built.gaps.has(target)),
+        ),
         binaryGaps: built.gaps,
         owners,
       })
@@ -1941,6 +1951,15 @@ export function buildSwiftResourceTable(
         throw new Error('swift image pack exceeds the compile service caps')
       }
       bytes = readPackageFile(project.packagePath, disk, limits.imageBytes)
+      const svg =
+        ext === '.svg'
+          ? rasterizeSvgFile(disk, createHash('sha256').update(bytes).digest('hex'))
+          : null
+      if (svg) {
+        bytes = svg.bytes
+        ext = '.png'
+        uploadName = `${path.posix.basename(file, path.posix.extname(file))}.png`
+      }
     }
     if (imageBytes + bytes.length > limits.imageTotalBytes) {
       throw new Error('swift image pack exceeds the compile service caps')

package/src/swift-objc-compile.ts

@@ -432,7 +432,7 @@ function* xcodeObjCInputSteps(
     if (
       !binary.reached ||
       binary.publicHeaders === undefined ||
-      binary.assemblySources !== undefined
+      binary.unloweredSources !== undefined
     )
       continue
     const manifest = swiftPackageManifest(binary.dir)

package/src/swift-objc-import.ts

@@ -24,12 +24,42 @@ export function swiftClangImporterFlags(flags: readonly string[]): string[] {
   )
 }
 
+// swift names a header's submodule as `import Module.Header`, which xcode
+// infers for every header of a framework. a header an app source imports that
+// way becomes its own submodule, visible with the module; the rest stay in it.
+const SWIFT_SUBMODULE_IMPORT =
+  /^[ \t]*(?:@\w+(?:\([^)]*\))?[ \t]+)*import[ \t]+([A-Za-z_]\w*)\.([A-Za-z_]\w*)[ \t]*(?:\/\/.*)?$/gm
+
+export function swiftSubmoduleImports(
+  sources: Iterable<string>,
+): Map<string, Set<string>> {
+  const imports = new Map<string, Set<string>>()
+  for (const source of sources)
+    for (const [, module, submodule] of source.matchAll(SWIFT_SUBMODULE_IMPORT)) {
+      const names = imports.get(module!) ?? new Set<string>()
+      names.add(submodule!)
+      imports.set(module!, names)
+    }
+  return imports
+}
+
 // swiftpm synthesizes a module map for public headers when the package provides
 // none. original xcode and package module maps retain their own contents.
-export function swiftObjCModuleMap(module: string, headers: readonly string[]): string {
+export function swiftObjCModuleMap(
+  module: string,
+  headers: readonly string[],
+  submodules: ReadonlySet<string> = new Set(),
+): string {
+  const header = (file: string) => `header ${JSON.stringify(file)}`
+  const stem = (file: string) =>
+    file.slice(file.lastIndexOf('/') + 1).replace(/\.[^.]*$/, '')
   return [
     `module ${module} {`,
-    ...headers.map((header) => `  header ${JSON.stringify(header)}`),
+    ...headers.map((file) =>
+      submodules.has(stem(file))
+        ? `  module ${stem(file)} { ${header(file)} export * }`
+        : `  ${header(file)}`,
+    ),
     '  export *',
     '}',
     '',

package/src/swift-objc-standin.ts

@@ -348,7 +348,7 @@ export function iosDeploymentMinimum(version: string | null): number | undefined
 const headerFiles = (dir: string): string[] =>
   fs
     .readdirSync(dir, { recursive: true, encoding: 'utf8' })
-    .filter((file) => file.endsWith('.h'))
+    .filter((file) => file.endsWith('.h') || file.endsWith('.hh'))
     .sort()
 
 /**

package/src/swift-packages.ts

@@ -19,6 +19,7 @@ import { cacheDir } from './home-paths'
 import { requireNativeGit } from './native-git'
 import { tryAcquireNumberedLock } from './numbered-lock'
 import { preparedSwiftCheckouts, preparedSwiftPin } from './prepared-xcode-phases'
+import { swiftCTakesReturnAddress } from './swift-compile'
 import {
   isSwiftNativeTranslationUnit,
   swiftImplicitResourcePaths,
@@ -36,6 +37,7 @@ import {
   type SwiftManifestTarget,
   type SwiftPackageManifest,
 } from './swift-package-manifest'
+import { shippedBinaryDiffers } from './swift-shipped-binaries'
 import type { SwiftSourceLinkGraph } from './swiftContract'
 
 // which machine a package target is built for
@@ -114,9 +116,9 @@ export interface SwiftPackageBinary {
   reached: boolean
   /** a source Objective-C target: public headers relative to dir. */
   publicHeaders?: string
-  /** assembly sources, relative to the package, that keep a source target from
-   *  compiling; its public headers stand in for it. */
-  assemblySources?: string[]
+  /** sources, relative to the package, with no wasm32 lowering that keep a
+   *  source target from compiling; its public headers stand in for it. */
+  unloweredSources?: string[]
   /** dependency module public headers, relative to dir. */
   headerDependencies?: { module: string; path: string }[]
   /** xcode modules whose linked package products reach this clang target. */
@@ -159,29 +161,42 @@ export function remoteSwiftCheckouts(root: string): string {
 // assembly requires its own target lowering; objective-c keeps its original bodies.
 const UNSUPPORTED_NATIVE = /\.(s|S)$/
 
-// a clang source target whose sources include assembly cannot lower to wasm,
-// unless upstream declares wasi-conditioned c settings for it: that is the
-// package's own supported portable path (boringssl's guarded assembly with
-// OPENSSL_NO_ASM), which compiles with those flags exactly as swiftpm builds
-// it. without that signal the target keeps the refusal below. when a refused
-// target also ships public headers, those headers stand in for it and every
-// declaration they spell traps by name. this is the assembly rule above,
-// widened only where the target has a header surface to stand in from.
-function assemblySources(
+// a clang source target whose sources include assembly, or take their own
+// return address, cannot lower to wasm, unless upstream declares
+// wasi-conditioned c settings for it: that is the package's own supported
+// portable path (boringssl's guarded assembly with OPENSSL_NO_ASM), which
+// compiles with those flags exactly as swiftpm builds it. without that signal
+// the target keeps the refusal below. when a refused target also ships public
+// headers, those headers stand in for it and every declaration they spell
+// traps by name. this is the assembly rule above, widened only where the
+// target has a header surface to stand in from.
+function unlowerableSources(
+  files: readonly string[],
+  target: SwiftManifestTarget,
+): string[] {
+  if (target.declaresWasiNativeSettings) return []
+  return [
+    ...files.filter((file) => UNSUPPORTED_NATIVE.test(file)),
+    ...files
+      .filter(isSwiftNativeTranslationUnit)
+      .filter((file) => swiftCTakesReturnAddress(fs.readFileSync(file, 'utf8'))),
+  ]
+}
+
+function unloweredSources(
   files: readonly string[],
   target: SwiftManifestTarget,
 ): string[] | null {
   if (target.type !== 'regular') return null
-  if (target.declaresWasiNativeSettings) return null
-  const assembly = files.filter((file) => UNSUPPORTED_NATIVE.test(file))
-  if (assembly.length === 0) return null
   if (!files.some(isSwiftNativeTranslationUnit)) return null
+  const unlowered = unlowerableSources(files, target)
+  if (unlowered.length === 0) return null
   const headers = path.resolve(target.dir, target.publicHeadersPath)
   if (
     !files.some((file) => file.startsWith(`${headers}${path.sep}`) && file.endsWith('.h'))
   )
     return null
-  return assembly
+  return unlowered
 }
 
 const BINARY = 'is a binary framework'
@@ -514,6 +529,8 @@ export function resolveSwiftPackages(options: {
   /** local package directories the workspace or a project references. */
   localDirs: readonly string[]
   provided: ReadonlySet<string> | null
+  /** binary targets whose stand-in is built; one pinning another archive than peach's shipped module compiles through it. */
+  standinTargets?: ReadonlySet<string>
   /** why a binary target has no stand-in, added to its reason. */
   binaryGaps?: ReadonlyMap<string, string>
   /**
@@ -657,9 +674,7 @@ export function resolveSwiftPackages(options: {
           ? swiftTargetFiles(pkg.manifest, target)
           : []
       const gap = options.binaryGaps?.get(name)
-      const assembly = target.declaresWasiNativeSettings
-        ? []
-        : files.filter((file) => UNSUPPORTED_NATIVE.test(file))
+      const unlowerable = unlowerableSources(files, target)
       const placeholder = placeholderPackage(pkg)
       const ownReason =
         target.type === 'binary'
@@ -668,8 +683,8 @@ export function resolveSwiftPackages(options: {
             ? `${name} stands in as a placeholder (${placeholder}), and ${gap}`
             : target.type !== 'regular' && target.type !== 'system'
               ? `${name} is a ${target.type} target`
-              : assembly.length > 0
-                ? `${name} is an assembly target with no wasm32 lowering: ${assembly.map((file) => path.relative(pkg.manifest.dir, file)).join(', ')}${gap ? `; ${gap}` : ''}`
+              : unlowerable.length > 0
+                ? `${name} has native sources with no wasm32 lowering: ${unlowerable.map((file) => path.relative(pkg.manifest.dir, file)).join(', ')}${gap ? `; ${gap}` : ''}`
                 : null
       // every dependency resolves, so a failing one never hides the rest
       // of the closure from the compile or from the report
@@ -778,9 +793,8 @@ export function resolveSwiftPackages(options: {
       )
     )
       return false
-    // an assembly target stands in from its public headers, so a stand-in
-    // peach built for it stays provided instead of compiling its sources
-    if (providedTargets.has(name) && assemblySources(files, target)) return false
+    // a target whose headers stand in for its unlowered sources stays with the stand-in
+    if (unloweredSources(files, target)) return false
     claimed.add(key)
     providedTargets.delete(name)
     for (const dependency of target.dependencies) {
@@ -794,6 +808,17 @@ export function resolveSwiftPackages(options: {
   }
   const claimProduct = (pkg: LoadedPackage, product: string): void => {
     const roots = pkg.manifest.products.get(product)?.targets ?? []
+    for (const root of roots) {
+      const target = pkg.manifest.targets.get(root)
+      if (
+        target?.type === 'binary' &&
+        !options.standinTargets?.has(root) &&
+        shippedBinaryDiffers(root, target.checksum)
+      ) {
+        providedTargets.delete(root)
+        providedProducts.delete(product)
+      }
+    }
     if (roots.map((name) => claimTarget(pkg, name)).some(Boolean))
       providedProducts.delete(product)
   }
@@ -840,7 +865,7 @@ export function resolveSwiftPackages(options: {
           : []
       const objc =
         target.type === 'regular' && files.some((file) => /\.(m|mm)$/.test(file))
-      const assembly = assemblySources(files, target)
+      const unlowered = unloweredSources(files, target)
       const gap = placeholderPackage(pkg)
       const sources = files.filter((file) => file.endsWith('.swift'))
       // swiftpm's release settings, as xcode builds a package for any
@@ -873,7 +898,7 @@ export function resolveSwiftPackages(options: {
             ],
           },
         })
-      else if (target.type === 'binary' || objc || assembly)
+      else if (target.type === 'binary' || objc || unlowered)
         result.binaries.push({
           target: name,
           source: pkg.source,
@@ -889,9 +914,9 @@ export function resolveSwiftPackages(options: {
                   path.join(target.dir, target.publicHeadersPath),
                 ),
               }),
-          ...(assembly
+          ...(unlowered
             ? {
-                assemblySources: assembly.map((file) =>
+                unloweredSources: unlowered.map((file) =>
                   path.relative(pkg.manifest.dir, file),
                 ),
               }