GH-21006 approach 3 on 8.4 (staging)#134
Open
iliaal wants to merge 1 commit into
Open
Conversation
FETCH_OBJ_FUNC_ARG reading a SIMPLE_GET property hook pushed the getter call frame mid-trace and corrupted the call being built, crashing at the following SEND_FUNC_ARG. Compile it inline like FETCH_OBJ_R, clearing the SIMPLE_GET flag so the read takes read_property. Positional arguments resolve their by-ref-ness at compile time through the preceding CHECK_FUNC_ARG; named arguments get a run-time guard that deoptimizes to the interpreter when the argument is passed by reference. Fixes phpGH-21006
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.
Approach 3 for phpGH-21006 ported to PHP-8.4, staging only to run the full 8.4 CI matrix (FREEBSD_NTS, Alpine musl-ASAN, etc.). The patch applies cleanly to 8.4 and was validated locally on glibc (GLOBAL_REGS) and musl clang-ASAN (!GLOBAL_REGS): gh21006 passes, ext/opcache/tests/jit and Zend/tests/property_hooks clean, the FETCH stays JIT-compiled.