peachsim 0.1.2224 → 0.1.2228

package/src/wasm-optimize.ts

@@ -1,15 +1,25 @@
-import { existsSync } from 'node:fs'
-import { join } from 'node:path'
+import { execFile } from 'node:child_process'
+import { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { promisify } from 'node:util'
 import { installVerifiedTarball } from '@contrast/runtime-delivery'
 import { BINARYEN_VERSION, wasmOpt } from 'wasm-opt'
 import { windowAdmission } from './admitted-mac-build'
 import { rnxHomeDir } from './home-paths'
+import {
+  dropBoundaryExports,
+  NARROW_MERGE_NAMES,
+  narrowWasmBoundary,
+} from './wasm-narrow-boundary'
 
-// packaged native executables, size-optimized. clang's own
-// optimizer pass is off (-O0 on the link) so an edit never pays for it and the
-// artifact never depends on the machine; this runs the pinned Binaryen once per
-// cached artifact instead. the features are the ones the link declares.
+// the linked wasm64 executable, made loadable: its host boundary narrowed to
+// 32 bits and its memory and table lowered to 32-bit addresses, so pointers stay
+// 8 bytes in memory while every browser runs the module. clang's own optimizer
+// pass is off (-O0 on the link) so the artifact never depends on the machine;
+// the pinned Binaryen size-optimizes once per cached artifact instead. the
+// features are the ones the link declares.
 const FEATURES = [
+  'memory64',
   'threads',
   'bulk-memory',
   'bulk-memory-opt',
@@ -25,8 +35,10 @@ const FEATURES = [
 // PEACH_SWIFT_NAMES=1 keeps the name section so a trap stack names its functions.
 export const KEEP_WASM_NAMES = process.env.PEACH_SWIFT_NAMES === '1'
 
+const LOWERING = ['--memory64-lowering', '--table64-lowering']
+
 /** feeds the artifact hash: a new optimizer or flag set is a new artifact. */
-export const WASM_OPTIMIZE_IDENTITY = `wasm-opt ${BINARYEN_VERSION} -Oz ${FEATURES.join(',')}${KEEP_WASM_NAMES ? ' -g' : ''}`
+export const WASM_LOWER_IDENTITY = `binaryen ${BINARYEN_VERSION} narrow ${LOWERING.join(' ')} ${FEATURES.join(',')} unoptimized-names`
 
 // the sha256 of each Binaryen release archive wasm-opt resolves for its own platform
 // keys; update both when the wasm-opt package moves BINARYEN_VERSION.
@@ -61,6 +73,7 @@ const BINARYEN_RELEASES = new Map([
 async function runWasmOpt(
   file: string,
   output: string,
+  optimize: boolean,
   skipPasses: readonly string[],
   binary: string,
 ): Promise<void> {
@@ -73,18 +86,44 @@ async function runWasmOpt(
         ? Math.min(admittedCores, requestedCores)
         : admittedCores,
     )
+  const features = FEATURES.map((feature) => `--enable-${feature}`)
+  // an unoptimized link keeps its name section, as before lowering, so a trap names its function
+  const names = optimize && !KEEP_WASM_NAMES ? [] : ['-g']
+  const narrowed = narrowWasmBoundary(readFileSync(file))
+  const merged = `${output}.narrowed`
+  if (narrowed) {
+    const guest = `${output}.guest`
+    const thunks = `${output}.thunks.wat`
+    writeFileSync(guest, narrowed.module)
+    writeFileSync(thunks, narrowed.thunks)
+    await promisify(execFile)(join(dirname(binary), 'wasm-merge'), [
+      ...features,
+      ...names,
+      guest,
+      NARROW_MERGE_NAMES.guest,
+      thunks,
+      NARROW_MERGE_NAMES.boundary,
+      '-o',
+      merged,
+    ])
+    writeFileSync(merged, dropBoundaryExports(readFileSync(merged)))
+    rmSync(guest)
+    rmSync(thunks)
+  }
   const result = await wasmOpt(
     [
-      '-Oz',
-      ...(KEEP_WASM_NAMES ? ['-g'] : []),
+      ...LOWERING,
+      ...(optimize ? ['-Oz'] : []),
+      ...names,
       ...skipPasses.flatMap((pass) => ['--skip-pass', pass]),
-      ...FEATURES.map((feature) => `--enable-${feature}`),
-      file,
+      ...features,
+      narrowed ? merged : file,
       '-o',
       output,
     ],
     { env: environment },
   )
+  if (narrowed) rmSync(merged)
   if (result.status !== 0)
     throw new Error(`wasm-opt exited ${result.status}: ${result.stderr}`)
 }
@@ -110,10 +149,16 @@ async function installWasmOpt(): Promise<string> {
   return binary
 }
 
-export async function optimizeWasm(
+export async function lowerWasm(
   file: string,
   output: string,
-  skipPasses: readonly string[] = [],
+  options: { optimize: boolean; skipPasses?: readonly string[] },
 ): Promise<void> {
-  await runWasmOpt(file, output, skipPasses, await installWasmOpt())
+  await runWasmOpt(
+    file,
+    output,
+    options.optimize,
+    options.skipPasses ?? [],
+    await installWasmOpt(),
+  )
 }

package/src/xcode-project.ts

@@ -105,7 +105,7 @@ export interface XcodeModuleTarget {
   /** the compilation conditions the build configuration defines, as `-D` passes them. */
   defines: string[]
   /** the resolved source iOS minimum, including for native package dependencies. */
-  iosDeploymentTarget: string | null
+  iosDeploymentTarget: string
   /** the build settings xcode's asset catalog compile reads, by name, empty ones omitted. */
   assetSettings: Record<string, string>
   /** original swift settings and the compatibility products declared by CocoaPods. */
@@ -2441,7 +2441,8 @@ export function readXcodeAppTarget(
         languageMode: swiftVersion >= 6 ? 6 : 5,
         mainActorIsolation: settings('SWIFT_DEFAULT_ACTOR_ISOLATION') === 'MainActor',
         defines: compilationConditions(settings),
-        iosDeploymentTarget: settings('IPHONEOS_DEPLOYMENT_TARGET') || null,
+        iosDeploymentTarget:
+          settings('IPHONEOS_DEPLOYMENT_TARGET') || XCODE_DEFAULT_IOS_DEPLOYMENT_TARGET,
         assetSettings: {
           IPHONEOS_DEPLOYMENT_TARGET: XCODE_DEFAULT_IOS_DEPLOYMENT_TARGET,
           ...Object.fromEntries(
@@ -2812,11 +2813,12 @@ export function readXcodeAppTarget(
       value === 'YES' ? true : value === 'NO' ? false : value
   }
   if (settings('GENERATE_INFOPLIST_FILE') === 'YES') {
-    const versions = {
+    const generated = {
+      CFBundleDevelopmentRegion: 'DEVELOPMENT_LANGUAGE',
       CFBundleShortVersionString: 'MARKETING_VERSION',
       CFBundleVersion: 'CURRENT_PROJECT_VERSION',
     }
-    for (const [key, setting] of Object.entries(versions)) {
+    for (const [key, setting] of Object.entries(generated)) {
       const value = settings(setting)
       if (info[key] === undefined && value) info[key] = value
     }