Repository navigation
AOT: preserve inheritUndefinedLocals temps across JUMP (#33936 follow-up) - #33951
Merged
Merged
Conversation
freeDeadVariables before JUMP was delref'ing FETCH_STATIC_PROP_R copies used by bare C::$a['k'] after keyed INIT_ARRAY forced a split. Co-authored-by: Cursor <cursoragent@cursor.com>
Complements #33944 (skip CFG split for static-prop dim) with the JUMP side fix so other inheritUndefinedLocals temps are not delref'd early. Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
PurHur
changed the title
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
StaticPropertyFetch.mergeBlockInheritsCallerLocalstreatsBlock::$inheritUndefinedLocalslike include merges, sofreeDeadVariablesbeforeTYPE_JUMPdoes not delref unnamed temps that the continuation still reads (Multi-argument calls silently pass the trailing argument's value to earlier arguments #23354 intent).??, mixed int/string keys).php-src
Zend/zend_execute.c—zend_fetch_dimension/ZEND_FETCH_STATIC_PROP_RTest plan
./script/aot-smoke.sh→ 8/8 (pre-merge baseline)PHP_COMPILER_HELPER_RUNTIME_O=0 php bin/compile.php -o /tmp/sa33936.bin test/repro/issue_33936_static_array_dim_aot.php && /tmp/sa33936.bin→1/1/1:1/1/1/9:1./script/phpunit.sh --filter 'StaticArrayDimFetch33936AotTest|Issue33936StaticArrayDimAotTest'→ OK