M2 spine: split cli.php for self-host bundle prep (#1467) - #1499
Merged
Conversation
Extract argv/vendor driver to src/cli_driver.php so src/cli.php is a bundleable compat shim (PHP_COMPILER_CLI_SPINE_BUNDLE). Fix tokenizer-compat define literal for AOT. Keep src/ units deferred in spine: bundling hits String_.php JIT link failure at current inventory size; infra ready for M4.
PurHur
force-pushed
the
fix/selfhost-src-cli-spine
branch
from
May 24, 2026 16:59
f71e930 to
345a5c6
Compare
7 tasks
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
src/cli.phpinto a bundleable compat shim plussrc/cli_driver.php(argv/vendor driver loaded bybin/*.php).PHP_COMPILER_CLI_SPINE_BUNDLE=1guard for native spine smoke runs.tokenizer-compat.phpdefine()to use compile-time literal387for self-host AOT.src/units deferred incompiler_lib_spine_smoke— adding them to the 299-unit spine triggersString_.phpJIT link failure at current inventory size; infra is ready for M4.Test plan
BOOTSTRAP_LIB_SPINE_SMOKE=1 make bootstrap-selfhost-lib-spine-smoke→ OKvendor/bin/phpunit test/unit/BootstrapSelfhostBundleTest.phpvendor/bin/phpunit test/unit/MemoryLimitPolicyTest.phpCloses #1467 (partial — spine bundle deferred; driver split unblocks M4).
Made with Cursor