Use attribute validator for assigning flags #19465
Open
+82
−95
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
|
Oh, I just noticed this has significant overlap with #18817 (which I only went to review right after this PR). |
iluuu1994
force-pushed
the
expand-attribute-validator
branch
from
f3bf298 to
49b4e45
Compare
|
I'd prefer to do #18817 first since that is for an RFC |
| @@ -70,7 +70,8 @@ typedef struct _zend_attribute { | |||
| typedef struct _zend_internal_attribute { | |||
| zend_class_entry *ce; | |||
| uint32_t flags; | |||
| void (*validator)(zend_attribute *attr, uint32_t target, zend_class_entry *scope); | |||
| /* Parameter offsets start at 1, everything else uses 0. */ | |||
There was a problem hiding this comment.
we shouldn't need both scope and target
| if (target_type & (ZEND_ATTRIBUTE_TARGET_FUNCTION|ZEND_ATTRIBUTE_TARGET_METHOD)) { | ||
| zend_op_array *op_array = target; | ||
| op_array->fn_flags |= ZEND_ACC_DEPRECATED; | ||
| } else if (target_type & (ZEND_ATTRIBUTE_TARGET_CLASS_CONST)) { |
There was a problem hiding this comment.
Suggested change
| } else if (target_type & (ZEND_ATTRIBUTE_TARGET_CLASS_CONST)) { | |
| } else if (target_type & ZEND_ATTRIBUTE_TARGET_CLASS_CONST) { |
| ZEND_CLASS_CONST_FLAGS(c) |= ZEND_ACC_DEPRECATED; | ||
| /* For deprecated constants, we need to flag the zval for recursion | ||
| * detection. Make sure the zval is separated out of shm. */ | ||
| scope->ce_flags |= ZEND_ACC_HAS_AST_CONSTANTS; |
There was a problem hiding this comment.
after removing the separate scope, can use
Suggested change
| scope->ce_flags |= ZEND_ACC_HAS_AST_CONSTANTS; | |
| c->ce->ce_flags |= ZEND_ACC_HAS_AST_CONSTANTS; |
and similar for the removal of ZEND_ACC_CONSTANTS_UPDATED
|
We should also move the |
That's ok with me. Though it makes your patch a bit more complicated, parts of it we might want to revert again. |
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.
No description provided.