macOS support: native generator mode, darwin artifacts via macOS runners, macOS CI matrix (#58) - #174
Merged
Merged
Conversation
Docker containers are Linux by construction, so darwin-{x64,arm64}
artifacts need the pipeline to run directly on a macOS host.
- generate.php learns --native (auto-selected off Linux): preflights the
toolchain, fetches the three php-src files emit.php slices, and runs
emit.php against the running interpreter. Verified on linux-x64-nts:
native regeneration is byte-identical to the committed Docker output.
- symbols.php marks Darwin's __sFILE opaque alongside glibc's _IO_FILE;
the opaque list is a per-platform name-match union, so unmatched names
never affect the emitted header.
- New "Generate darwin headers" workflow: generates on macos-latest
(arm64) and macos-15-intel (x64), validates via the FFI/probe stage,
and commits both artifact dirs back to the branch in one commit.
- CI gains tests-macos and header-drift-darwin matrix legs; both warn
and skip until the darwin artifacts are committed, then run for real.
The darwin opcache non-skip gate stays informational until proven.
- Docs: support matrix, AGENTS.md native/darwin sections.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0188iU6pEvBQgtjPTXEdzHwj
Darwin declares FILE as "typedef struct __sFILE { ... } FILE;" with the
record body inline, so slicing the typedef's source dragged the full
libc body (and its by-value member types like struct __sbuf) into the
header, which FFI then failed to parse. glibc forward-declares the tag
separately, which is why the slice worked on Linux.
Opaque typedefs with a named underlying tag now emit a synthesized
"typedef struct <tag> <name>;" instead of the source slice. On glibc the
synthesized text is identical to the source, verified byte-identical by
native regeneration against the committed linux-x64-nts artifacts.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0188iU6pEvBQgtjPTXEdzHwj
The flat-memory tests read VmRSS from /proc/self/status through five copies of the same closure; on macOS the missing procfs made file() emit a warning, which failOnWarning turns into a failed run even with all 425 tests passing. The new ZEngine\Support\ResidentMemory helper keeps the VmRSS path on Linux (guarded, warning-free) and samples `ps -o rss=` on macOS/BSD - so the RSS-based leak assertions now run on darwin instead of skipping. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0188iU6pEvBQgtjPTXEdzHwj
lisachenko
marked this pull request as ready for review
August 8, 2026 12:19
Both macOS legs pass the full opcache group (26 tests, including the file-cache relocator) with --fail-on-skipped, so the temporary continue-on-error comes off - the gate now guards darwin exactly like the Linux NTS leg. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0188iU6pEvBQgtjPTXEdzHwj
This was referenced Aug 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Implements #58: macOS (darwin, x64 + arm64) support, NTS scope. The full bootstrap has completed on this branch — darwin artifacts are generated, committed, and validated, and every CI leg including the new macOS ones is green.
The runtime was already darwin-ready —
Core::platformKey()resolvesinclude/8.4/darwin-{arch}-nts/on macOS, andemit.phpderives OS/arch/TS from the running interpreter. What was missing was a way to produce the darwin artifacts: the generator's Docker orchestration can only ever emit linux artifacts (containers are Linux by construction). This PR closes that gap and wires macOS into the CI matrix.What's in here
generate.php --native(auto-selected on non-Linux hosts): runsemit.phpdirectly against the running PHP build. Preflightsclang/cc/php-config/ext-ffi with actionable errors, fetches the three php-src files the pipeline slices for the exact running patch release, or accepts--php-src=DIR. Verified on linux-x64-nts: native regeneration reproduces the committed Docker artifacts byte-identically.include/8.4/darwin-{x64,arm64}-nts/: the generated artifacts themselves, produced and committed by the workflow below from real macOS PHP 8.4.24 builds. Validation proved on both arches: the header parses under macOS FFI, every extern resolves from the php process image (noFFI_LIBneeded — same as Linux), and all 39 struct layouts match the C compiler exactly.HeaderEmitter: opaque typedefs now emit a synthesized bodylesstypedef struct <tag> <name>;— Darwin declaresFILEwith the struct body inline, which previously dragged the whole libc__sFILE/__sbufsurface into the header.symbols.phpadds__sFILEto the opaque union list (name-matched per platform; Linux output unchanged, proven by the linuxheader-driftjob).tests/Support/ResidentMemory: the flat-memory/leak-plateau tests sampled RSS from/proc/self/status; they now use a portable helper (procfs on Linux,ps -o rss=on macOS/BSD) — so those assertions genuinely run on macOS instead of skipping.generate.php --nativeonmacos-latest(arm64) andmacos-15-intel(x64); a single downstream job commits both artifact dirs in one commit (no push race). Triggers onpull_requesttouchingtools/generator/**(same-repo PRs) andworkflow_dispatchfor refreshes — the canonical way to regenerate darwin artifacts, documented in AGENTS.md.tests-macoslegs (arm64 + x64) mirroring the Linux tests job — full suite, blocking opcache non-skip gate (the file-cache relocator passes on both darwin arches), worker-loop soak (flat at +32 bytes / 10k iterations) — plusheader-drift-darwinlegs that natively regenerate and diff each runner's own arch dir. Both guard on artifact presence so future branches without darwin artifacts warn instead of failing spuriously.darwin-x64-nts,darwin-arm64-nts), AGENTS.md native-mode + darwin sections.Acceptance (issue #58)
generate.php --nativeproducesinclude/8.4/darwin-{x64,arm64}-nts/*(via the generation workflow)Follow-ups (out of scope)
mastergets the tooling via merge-up; oneworkflow_dispatchrun of "Generate darwin headers" onmasteronce its generator is ready8.4, via Packagist8.4.x-dev)Closes #58
🤖 Generated with Claude Code
https://claude.ai/code/session_0188iU6pEvBQgtjPTXEdzHwj