M5 spine link: refuse Zend inventory rebuild when NO_ZEND_FALLBACK set (#8716) - #8857
Merged
Merged
Conversation
#8716) Extend bootstrap_ensure_inventory_argv_driver to fail closed under BOOTSTRAP_NO_ZEND_FALLBACK=1 (not only BOOTSTRAP_M5_NO_ZEND), fall back to native driver resolver in lib-spine-smoke-link, and fix ObGzhandlerJitRuntime PHI dominance that blocked inventory argv emit verify(). Co-authored-by: Cursor <cursoragent@cursor.com>
Closed
5 tasks
Owner
Author
|
Maintainer: merged after local verification — both unit tests green, |
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
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
bootstrap_ensure_inventory_argv_drivernow fails closed whenBOOTSTRAP_NO_ZEND_FALLBACK=1(previously onlyBOOTSTRAP_M5_NO_ZEND=1), blocking the Zendhelloworld-compile-binrebuild path (Self-host M5: PHP_COMPILER_LIB_SPINE_BUNDLE compile path — no Zend gen-0 fallback in CI #8716).bootstrap-selfhost-lib-spine-smoke-link.shfalls back to native driver resolver when prelinked inventory smoke fails instead of hard-exiting before the compile step.ObGzhandlerJitRuntime::emitResolveEncoding()PHI dominance (resolveDoneBbincoming block) that caused LLVM verify failure during inventory argv driver rebuild.BOOTSTRAP_NO_ZEND_FALLBACK=1for lib spine smoke; add bootstrap script unit assertions.Closes #8716
Test plan
Merge blocker (follow-up)
Refresh
prelinked/bootstrap-gen0/sidecar stamp+blob after spine entry #8820, or fix native spine compile null — then re-runBOOTSTRAP_NO_ZEND_FALLBACK=1 make bootstrap-selfhost-lib-spine-smokeandmake north-star5-verify-fast.Made with Cursor