CI: fix clean-checkout apply-patches for simplifier use-chain (#36377) - #36413
Merged
Merged
Conversation
On pristine vendor the Python overlay rewrote replaceVariables but never extracted replaceVariablesByCfgWalk, so rm -rf vendor && composer install failed with "expected exactly one replaceVariablesByCfgWalk". Use git apply for the committed patch on pristine trees; keep the Python repair path for duplicate partial applies (#36250). Co-authored-by: Cursor <cursoragent@cursor.com>
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
composer installtrees,apply_php_cfg_simplifier_use_chain_overlayran only the Python flip, which rewrotereplaceVariablesbut never extractedreplaceVariablesByCfgWalkfrom the old body.expected exactly one replaceVariablesByCfgWalk, blockingapply-patches.sh,north-star5-verify-fast, and Docker CI.apply_patch_file_directon pristine vendor (the committed.patchapplies cleanly); keep the Python repair path for duplicate partial applies (Front end: the Simplifier use-chain default flip (#23070) never applied to already-patched trees — the grep guard skips the updated patch, so dev boxes and helper-cache emitters still run the legacy O(phis×blocks) walk (re-#36225) (script/apply-patches.sh:560, patches/php-cfg-simplifier-use-chain.patch) #36250).Test plan
rm -rf vendor && composer install && script/apply-patches.sh→ exit 0 (Docker)./script/aot-smoke.sh→ 9/9make north-star5-verify-fast→ OKCloses #36377
Made with Cursor