Fix zend_separate_if_call_and_write for FUNC_ARGs #12140
Closed
Conversation
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
iluuu1994
changed the title
iluuu1994
force-pushed
the
gh-12102
branch
6 times, most recently
from
e184f86 to
3361eb3
Compare
dstogov
requested changes
Sep 7, 2023
dstogov
reviewed
Sep 7, 2023
Zend/Optimizer/optimize_func_calls.c
Outdated
| @@ -272,6 +281,7 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx) | |||
| opline->opcode = ZEND_FETCH_STATIC_PROP_R; | |||
| } | |||
| } | |||
| MAKE_NOP(call_stack[call - 1].last_check_func_arg_opline); | |||
There was a problem hiding this comment.
I'm not sure if this is the right place for MAKE_NOP.
I would move it into ZEND_SEND_FUNC_ARG.
case ZEND_SEND_FUNC_ARG:
/* Don't transform SEND_FUNC_ARG if any FETCH opcodes weren't transformed. */
if (call_stack[call - 1].last_check_func_arg_opline == NULL) {
if (opline->op2_type == IS_CONST) {
call_stack[call - 1].try_inline = 0;
}
break;
+ } else {
+ MAKE_NOP(call_stack[call - 1].last_check_func_arg_opline);
}
call_stack[call - 1].last_check_func_arg_opline = NULL;
ZEND_FALLTHROUGH;
case ZEND_SEND_VAR_EX:
dstogov
approved these changes
Sep 7, 2023
|
Thanks for the reviews @dstogov! |
iluuu1994
added a commit
that referenced
this pull request
Sep 7, 2023
|
Merged as 748adf1 (misspelled "closes") |
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.
Fixes GH-12102
Note on the optimizer changes: Zend/tests/gh12102_3.phpt demonstrates an existing issue in the optimizer. Namely, we're always converting
FETCH_DIM_FUNC_ARG/FETCH_OBJ_FUNC_ARGintoFETCH_DIM_W/FETCH_OBJ_Wif the parameter is known to be by-ref. However, this is incorrect for containers that areTMP, as there's no such specialization.If we don't convert these fetches, we also need to keep the
CHECK_FUNC_ARGopcode, so that we're actually aware of the fetch-mode in theFUNC_ARGopcodes.