Convert ZEND_ECHO operand to string #5118
Closed
Conversation
This file contains 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
nikic
reviewed
Jan 26, 2020
TysonAndre
force-pushed
the
optimize-echo
branch
from
596d4c8 to
64387ef
Compare
nikic
reviewed
Jan 27, 2020
| } | ||
| /* TODO: In a subsequent pass, *after* this step and compacting nops, combine consecutive ZEND_ECHOs using the block information from ssa->cfg */ | ||
| /* (e.g. for ext/opcache/tests/opt/sccp_010.phpt) */ | ||
| /* https://github.com/php/php-src/pull/5097#issuecomment-577306560 */ |
There was a problem hiding this comment.
These comments don't really make sense in this context anymore.
| val = CT_CONSTANT_EX(op_array, opline->op1.constant); | ||
| } else { | ||
| opline->op1.constant = zend_optimizer_add_literal(op_array, val); | ||
| } |
There was a problem hiding this comment.
I'd write this as:
if (Z_TYPE_P(val) != IS_STRING && zend_optimizer_eval_cast(&zv, IS_STRING, val) == SUCCESS) {
zval_ptr_dtor_nogc(val);
val = &zv;
}
opline->op1.constant = zend_optimizer_add_literal(op_array, val);
Destroying val is technically not necessary because it so happens that the cast can only succeed if the original value wasn't refcounted, but I think this makes the logic of the code more obvious.
There was a problem hiding this comment.
Is IS_RESOURCE possible (e.g. STDOUT)? That is refcounted
There was a problem hiding this comment.
I believe inside opcache it's not possible.
TysonAndre
changed the title
TysonAndre
force-pushed
the
optimize-echo
branch
from
64387ef to
cb97922
Compare
And filter out echoes of the empty string (e.g. false/null) Split out of php#5097
TysonAndre
force-pushed
the
optimize-echo
branch
from
9f4aed5 to
bbf16d9
Compare
nikic
approved these changes
Jan 27, 2020
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.
And filter out echoes of the empty string (e.g. false/null)
Split out of #5097