Switch zend_type to use MAY_BE_* mask #4727
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
So that we can place all type hints in a MAY_BE union.
nikic
commented
Sep 20, 2019
dstogov
approved these changes
Sep 23, 2019
|
|
||
| #define ZEND_TYPE_ENCODE_CODE(code, allow_null) \ | ||
| (((code) == _IS_BOOL ? (MAY_BE_FALSE|MAY_BE_TRUE) : (1 << (code))) \ | ||
| | ((allow_null) ? _ZEND_TYPE_NULLABLE_BIT : Z_L(0x0))) |
There was a problem hiding this comment.
I would keep the old prototype and meaning for ZEND_TYPE_ENCODE() and introduce ZEND_TYPE_ENCODE_MASK().
| zend_op *opline; | ||
|
|
||
| /* `return ...;` is illegal in a void function (but `return;` isn't) */ | ||
| if (ZEND_TYPE_CODE(return_info->type) == IS_VOID) { | ||
| if (ZEND_TYPE_IS_CODE(type) && ZEND_TYPE_CONTAINS_CODE(type, IS_VOID)) { |
There was a problem hiding this comment.
I think, it doesn't make sense to unite "void" with anything else.
This check may be simplified to (ZEND_TYPE_MASK(type) == MAY_BE_VOID).
| | EXT_CALL zend_missing_arg_error, r0 | ||
| | jmp ->exception_handler | ||
| |.code | ||
|
|
There was a problem hiding this comment.
Was this chunk improperly placed before?
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.
This switches zend_type from storing a single IS_* type code to storing a MAY_BE_* type mask. Right now most code still assumes that there is only a single type in the mask (or two together with MAY_BE_NULL). But this will make it a lot simpler to introduce union types.
An additional advantage (and why I'm doing this separately), is that a number of special cases no longer need to be handled separately: We can do a single
mask & (1 << type)check to handle all simple types, booleans (true|false) and null.@dstogov Can you please take a look at this?