Repository navigation
JIT: keep CONST_FETCH literals under INCLUDE_SCOPE_REMAP=0 (#29111) - #29120
Merged
Merged
Conversation
Spine AOT with remapping disabled aliased parent defined() name Literals onto callee slots, so TimezoneAbbreviationsData CONST_FETCH resolved "defined" instead of "true". Remap colliding Literals even when Var indices stay shared, and prefer the first Literal in getOperand. Co-authored-by: Cursor <cursoragent@cursor.com>
This was referenced Aug 8, 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
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_INCLUDE_SCOPE_REMAP=0was resolving calleeCONST_FETCH 'true'as parent Literal"defined"afterinheritScopeFrom, killingTimezoneAbbreviationsData.phpat{main}:op=0:type=5.getOperandkeeps the first Literal at a slot.IncludeScopeConstFetchLiteralTest, mini-spine undertest/selfhost/issue_29111_const_fetch_spine/(SourceBundler skipped), AOT phpunit case withREMAP=0.php-src reference
N/A (compiler lowering). Prior: #16866 / #16873.
Verification
Not covered this PR: full exclusive gen-0 spine refresh (~hours). After merge, #28998 can re-run
./script/bootstrap-gen0-refresh-exclusive-docker.shand skip re-deferringTimezoneAbbreviationsData(or un-defer if already deferred on that branch).Pre-triage gates
north-star5-fast: okhelper-runtime-prelink --strict: red (30 stale — Trust: helper-runtime prelink --strict red — 30 stale VM/standard units (prelinked/helper-runtime) #29109 / Trust: helper-runtime prelink --strict red — 18 stale filter/standard/VM units (prelinked/helper-runtime) #29041; not this change)gen0_provenance: stale (blocks honest link; Trust: refresh gen-0 spine sidecar — stamp ≠ spine SHA; link falls back to Zend (prelinked/bootstrap-gen0) #28998)Made with Cursor