Fix M2 lib spine VM smoke gate (#1846) - #2597
Merged
Merged
Conversation
Re-wire PHP_COMPILER_VM_SPINE_SMOKE dispatch in compiler_lib_spine_smoke with a safe getenv() type guard (native AOT segfaults when comparing false to string literals). Add VmSpineSmokeNative LLVM lowering for vm_run_smoke so the bundled symbol does not pull Runtime parse spine into the link. Verification: BOOTSTRAP_LIB_SPINE_VM_SMOKE=1 make bootstrap-selfhost-lib-spine-vm-smoke 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
PHP_COMPILER_VM_SPINE_SMOKEdispatch incompiler_lib_spine_smoke/main.php(removed in CI: COALESCE_COMPLIANCE_GATE default-on in ci-fast (audit + close #99) #1960 whenvm_run_smokebroke native link).getenv('PHP_COMPILER_VM_SPINE_SMOKE')withis_string()so native AOT does not segfault when the variable is unset (falsevs string compare).lib/JIT/VmSpineSmokeNative.phpand alib/JIT.phphook to LLVM-lowervm_run_smoke()underPHP_COMPILER_SELFHOST_AOTwithout pulling the full Runtime parse spine (prep for wiring the call site back tovm_run_smoke()).Test plan
BOOTSTRAP_LIB_SPINE_VM_SMOKE=1 make bootstrap-selfhost-lib-spine-vm-smoke(Docker)make bootstrap-selfhost-lib-spine-smoke/ link script printscompiler_lib_spine_smoke bundle OKvendor/bin/phpunit --filter BootstrapLibSpineVmSmokeTestCloses #1846 · advances #1492 M2 VM
-rsmoke.Made with Cursor