Skip to content

chore(gen): regenerate 8.6 headers for the upstream EG/CG padding - #311

Merged
lisachenko merged 2 commits into
masterfrom
feature/modest-cerf-1277hn
Nov 16, 2026
Merged

lisachenko merged 2 commits into
masterfrom
feature/modest-cerf-1277hn

Conversation

@lisachenko

Copy link
Copy Markdown
Owner

What this changes

Fixes the red CI on master after #310 (4bb4a15). The six failing jobs were the linux/darwin "Generated headers up to date" checks for PHP 8.6. Tests and PHPStan were green.

The cause is upstream, not the merge: php-src master (the 8.6 dev line) added an ABI-padding union to both zend_compiler_globals and zend_executor_globals (Zend/zend_globals.h):

union {
	uint64_t padding[8];
	// struct { Add here. };
};

and bumped ZEND_MODULE_API_NO from 20260924 to 20261112. The 8.6 nightly CI builds picked that up, so the committed artifacts drifted. The #310 merge itself touches nothing under include/, stubs/ or the generator.

The two commits here come from the repo's own Generate linux headers and Generate darwin headers workflows (workflow_dispatch on this branch); nothing was hand-edited. Per target, the diff is:

  • engine.h: the new trailing padding union in both structs
  • layouts.json: padding at the end of each struct; EG 2224 → 2288 bytes, CG 616 → 680 (linux nts). No existing field offset moves.
  • constants.php / layouts meta.api: the API number bump
  • probe.c: the two new offsetof probes
  • stubs/zend-engine-structs.php: a public \FFI\CData $padding on both stubs

Windows has no 8.6 artifacts, so it's unaffected.

Environment it was verified on

  • PHP version: generated by CI on the setup-php 8.6 nightly builds (linux x64 and macOS x64/arm64, NTS and ZTS). Nothing was run locally: this sandbox has PHP 8.5, and master targets 8.6.
  • Thread safety: NTS and ZTS
  • OS / architecture: linux-x64, darwin-x64, darwin-arm64
  • Debug build: no

Checklist

  • Targets the minimum affected version branch: the change only exists in 8.6, so it goes to master directly
  • composer test passes on the matching PHP minor (left to CI on this PR)
  • composer phpstan (level max) and composer cs:check are green (left to CI)
  • No struct the code dereferences changed shape; padding is new and unread
  • Regenerated with the generator workflows, nothing under include/ or stubs/ hand-edited
  • Conventional Commits used for the commit messages (the workflow commit messages are the generator's own)

Generated by Claude Code

@lisachenko
lisachenko marked this pull request as ready for review November 16, 2026 18:47
@lisachenko
lisachenko merged commit c75cd62 into master Nov 16, 2026
22 checks passed
@lisachenko
lisachenko deleted the feature/modest-cerf-1277hn branch November 16, 2026 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant