Skip to content

Commit 700559d

Browse files
committed
flags -> property_flags
1 parent 5f19b93 commit 700559d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Zend/zend_compile.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6598,7 +6598,7 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32_t fall
65986598
zend_string *name = zval_make_interned_string(zend_ast_get_zval(var_ast));
65996599
bool is_ref = (param_ast->attr & ZEND_PARAM_REF) != 0;
66006600
bool is_variadic = (param_ast->attr & ZEND_PARAM_VARIADIC) != 0;
6601-
uint32_t flags = param_ast->attr & (ZEND_ACC_PPP_MASK | ZEND_ACC_READONLY);
6601+
uint32_t property_flags = param_ast->attr & (ZEND_ACC_PPP_MASK | ZEND_ACC_READONLY);
66026602

66036603
znode var_node, default_node;
66046604
zend_uchar opcode;
@@ -6680,7 +6680,7 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32_t fall
66806680

66816681
if (type_ast) {
66826682
uint32_t default_type = *default_ast_ptr ? Z_TYPE(default_node.u.constant) : IS_UNDEF;
6683-
bool force_nullable = default_type == IS_NULL && !flags;
6683+
bool force_nullable = default_type == IS_NULL && !property_flags;
66846684

66856685
op_array->fn_flags |= ZEND_ACC_HAS_TYPE_HINTS;
66866686
arg_info->type = zend_compile_typename(type_ast, force_nullable);
@@ -6723,14 +6723,14 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32_t fall
67236723
}
67246724

67256725
uint32_t arg_info_flags = _ZEND_ARG_INFO_FLAGS(is_ref, is_variadic, /* is_tentative */ 0)
6726-
| (flags ? _ZEND_IS_PROMOTED_BIT : 0);
6726+
| (property_flags ? _ZEND_IS_PROMOTED_BIT : 0);
67276727
ZEND_TYPE_FULL_MASK(arg_info->type) |= arg_info_flags;
67286728
if (opcode == ZEND_RECV) {
67296729
opline->op2.num = type_ast ?
67306730
ZEND_TYPE_FULL_MASK(arg_info->type) : MAY_BE_ANY;
67316731
}
67326732

6733-
if (flags) {
6733+
if (property_flags) {
67346734
zend_op_array *op_array = CG(active_op_array);
67356735
zend_class_entry *scope = op_array->scope;
67366736
bool is_ctor =
@@ -6777,7 +6777,7 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32_t fall
67776777
zend_string *doc_comment =
67786778
doc_comment_ast ? zend_string_copy(zend_ast_get_str(doc_comment_ast)) : NULL;
67796779
zend_property_info *prop = zend_declare_typed_property(
6780-
scope, name, &default_value, flags | ZEND_ACC_PROMOTED, doc_comment, type);
6780+
scope, name, &default_value, property_flags | ZEND_ACC_PROMOTED, doc_comment, type);
67816781
if (attributes_ast) {
67826782
zend_compile_attributes(
67836783
&prop->attributes, attributes_ast, 0, ZEND_ATTRIBUTE_TARGET_PROPERTY);

0 commit comments

Comments
 (0)