Fix php-llvm-structgep-assert.patch drift blocking CI (#36209) - #36233
Merged
Conversation
Re-diff structgep patch against pristine php-llvm Builder (removed fictional null-check context), add --verify-pristine gate with committed snapshot, require reverse-apply proof for structgep skip, fix loop-exit-tick Do anchor (Echo not Enum), and run verify-pristine in workflows before apply-patches. Verified: script/apply-patches.sh --verify-pristine rm -rf vendor && composer install && script/apply-patches.sh ./script/aot-smoke.sh → 8/8 make dev-verify-fast → OK (59s) Closes #36209 Co-authored-by: Cursor <cursoragent@cursor.com>
This was referenced Sep 1, 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
1 participant
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
php-llvm-structgep-assert.patchagainst pristine php-llvmBuilder.php— removed fictionalnull === $struct->valuecontext that never existed in vendor and blockedgit applyon freshcomposer install.script/apply-patches.sh --verify-pristine(checks structgep + icmp patches against committedpatches/pristine-snapshots/) and wired it into all workflows +check-generated-docs.sh.patch_is_fully_applied(reverse-apply proof), not grep-only marker.php-cfg-loop-exit-tickDo anchor (parseStmt_EchofollowsparseStmt_Do, notparseStmt_Enum) soapply-patches.shcompletes on pristine vendor.|| truefromci-common.shcomposer install (surfaces setup failures in CI).Test plan
script/apply-patches.sh --verify-pristine→ OK structgep + icmprm -rf vendor && composer install && script/apply-patches.sh→ exit 0./script/aot-smoke.sh→ 8/8make dev-verify-fast→ OK (59s)make north-star5-verify-fast— not run this session (dev-verify-fast green)script/differential-sweep.sh --aot --repeat 3— not re-run (142/142 on master at session start)Closes #36209
Made with Cursor