peachsim 0.1.2219 → 0.1.2220

package/src/swift-packages.ts

@@ -165,18 +165,23 @@ const UNSUPPORTED_NATIVE = /\.(s|S)$/
 // 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.
+// compiles with those flags exactly as swiftpm builds it. assembly that
+// preprocesses to nothing for wasm32 (guarded to the architectures it was
+// written for) is the same portable path without the signal: swiftpm compiles
+// it as plain c. otherwise 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,
+  portable: ReadonlySet<string>,
 ): string[] {
   if (target.declaresWasiNativeSettings) return []
   return [
-    ...files.filter((file) => UNSUPPORTED_NATIVE.test(file)),
+    ...(portable.has(target.name)
+      ? []
+      : files.filter((file) => UNSUPPORTED_NATIVE.test(file))),
     ...files
       .filter(isSwiftNativeTranslationUnit)
       .filter((file) => swiftCTakesReturnAddress(fs.readFileSync(file, 'utf8'))),
@@ -186,10 +191,11 @@ function unlowerableSources(
 function unloweredSources(
   files: readonly string[],
   target: SwiftManifestTarget,
+  portable: ReadonlySet<string>,
 ): string[] | null {
   if (target.type !== 'regular') return null
   if (!files.some(isSwiftNativeTranslationUnit)) return null
-  const unlowered = unlowerableSources(files, target)
+  const unlowered = unlowerableSources(files, target, portable)
   if (unlowered.length === 0) return null
   const headers = path.resolve(target.dir, target.publicHeadersPath)
   if (
@@ -533,6 +539,8 @@ export function resolveSwiftPackages(options: {
   standinTargets?: ReadonlySet<string>
   /** why a binary target has no stand-in, added to its reason. */
   binaryGaps?: ReadonlyMap<string, string>
+  /** assembly targets whose sources preprocess to nothing for wasm32. */
+  portableAssembly?: ReadonlySet<string>
   /**
    * each compiling module and the package products it links. a clang target
    * in that product's closure records the module as a client.
@@ -542,6 +550,7 @@ export function resolveSwiftPackages(options: {
 }): SwiftPackages {
   const { rootDir, resolved, products, localDirs } = options
   const providedTargets = new Set(options.provided ?? [])
+  const portableAssembly = options.portableAssembly ?? new Set<string>()
   const providedProducts = new Set(options.provided ?? [])
   const result: SwiftPackages = {
     sourceLinks: { targets: [], owners: [] },
@@ -674,7 +683,7 @@ export function resolveSwiftPackages(options: {
           ? swiftTargetFiles(pkg.manifest, target)
           : []
       const gap = options.binaryGaps?.get(name)
-      const unlowerable = unlowerableSources(files, target)
+      const unlowerable = unlowerableSources(files, target, portableAssembly)
       const placeholder = placeholderPackage(pkg)
       const ownReason =
         target.type === 'binary'
@@ -794,7 +803,7 @@ export function resolveSwiftPackages(options: {
     )
       return false
     // a target whose headers stand in for its unlowered sources stays with the stand-in
-    if (unloweredSources(files, target)) return false
+    if (unloweredSources(files, target, portableAssembly)) return false
     claimed.add(key)
     providedTargets.delete(name)
     for (const dependency of target.dependencies) {
@@ -865,7 +874,7 @@ export function resolveSwiftPackages(options: {
           : []
       const objc =
         target.type === 'regular' && files.some((file) => /\.(m|mm)$/.test(file))
-      const unlowered = unloweredSources(files, target)
+      const unlowered = unloweredSources(files, target, portableAssembly)
       const gap = placeholderPackage(pkg)
       const sources = files.filter((file) => file.endsWith('.swift'))
       // swiftpm's release settings, as xcode builds a package for any

package/src/swift-standins.ts

@@ -1747,7 +1747,7 @@ function graphStandin(
       before
     )
       throw new Error(
-        `its generated source does not typecheck: ${elsewhere.slice(0, 3).join('; ') || check.stderr.trim().slice(0, 400)}`,
+        `its generated source does not typecheck: ${(elsewhere.length > 0 ? elsewhere : [...check.stderr.matchAll(/^\S+?:\d+:\d+: error: .*$/gm)].map((line) => line[0].replace(/^[^:]*\//, ''))).slice(0, 3).join('; ') || check.stderr.trim().slice(0, 400)}`,
       )
   }
 }