Improve string class constant code generation #9577
Merged
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
977190b to
d3b385f
Compare
mvorisek
reviewed
Sep 19, 2022
| @@ -1670,7 +1670,7 @@ public function initializeZval(string $zvalName, iterable $allConstInfos): strin | |||
| $code .= "\tZVAL_EMPTY_STRING(&$zvalName);\n"; | |||
| } else { | |||
| $constValue = $cConstValue ?: '"' . addslashes($this->value) . '"'; | |||
| $code .= "\tzend_string *{$zvalName}_str = zend_string_init($constValue, sizeof($constValue) - 1, 1);\n"; | |||
| $code .= "\tzend_string *{$zvalName}_str = zend_string_init($constValue, strlen($constValue), 1);\n"; | |||
There was a problem hiding this comment.
Suggested change
| $code .= "\tzend_string *{$zvalName}_str = zend_string_init($constValue, strlen($constValue), 1);\n"; | |
| $code .= "\tzend_string *{$zvalName}_str = zend_string_init($constValue, strlen($constValue), true);\n"; |
There was a problem hiding this comment.
@kocsismate why is 1 preferred over true?
There was a problem hiding this comment.
@mvorisek I wouldn't say at all that 1 is preferred, but TBH I don't really care which value is used.
|
While this seems OK, why not simply use |
Unfortunately, it's not possible to call zend_declare_class_const_string() directly, since it only supports declaring public constants. :( |
Girgias
approved these changes
Sep 20, 2022
Using strlen() will make sure that non-constant values can also be used.
d3b385f to
45caf1a
Compare
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.
I don't see any problem with using
strlen(), especially becausezend_declare_class_const_string()has always been using this function until PHP 8.2. Unfortunately, it's not possible to callzend_declare_class_const_string()directly, since it only supports declaring public constants.