com php-src: Begin implementing generic traits: Zend/zend.h Zend/zend_ast.h Zend/zend_compile.c Zend/zend_lan guage_parser.y Zend/zend_vm_def.h
Zend/zend_vm _execute.h Zend/zend_vm_opcodes.c Zend/zend_vm _opcodes.h
| From: | Joe Watkins | Date: | Wed, 15 Nov 2017 21:38:22 +0000 |
| Subject: | com php-src: Begin implementing generic traits: Zend/zend.h Zend/zend_ast.h Zend/zend_compile.c Zend/zend_lan guage_parser.y Zend/zend_vm_def.h Zend/zend_vm _execute.h Zend/zend_vm_opcodes.c Zend/zend_vm _opcodes.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-100305@lists.php.net to get a copy of this message | ||
Commit: 09a10ff949418afc9099013000ed1d5e1cdbb642
Author: Levi Morrison <levim@php.net> Mon, 13 Nov 2017 22:44:28 -0700
Parents: 61ae64f6ab8e73f9cfd3e3b69987e699ded4d104
Branches: levi/generic_traits
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=09a10ff949418afc9099013000ed1d5e1cdbb642
Log:
Begin implementing generic traits
Still need to parse and store the generic parameters for
diff --git a/Zend/zend.h b/Zend/zend.h index 3cd5036..5fc1980 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -156,7 +156,13 @@ struct _zend_class_entry { uint32_t num_interfaces; uint32_t num_traits; - zend_class_entry **interfaces; + + union { + zend_class_entry **interfaces; + + /* trait definitons hold the names here */ + zend_string **type_parameters; + }; zend_class_entry **traits; zend_trait_alias **trait_aliases; diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 99ad920..0527c3a 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -137,6 +137,7 @@ enum _zend_ast_kind { ZEND_AST_METHOD_CALL = 3 << ZEND_AST_NUM_CHILDREN_SHIFT, ZEND_AST_STATIC_CALL, ZEND_AST_CONDITIONAL, + ZEND_AST_USE_PARAMETERIZED_TRAIT, ZEND_AST_TRY, ZEND_AST_CATCH, diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 85d5abb..2160070 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1236,6 +1236,7 @@ void zend_do_early_binding(void) /* {{{ */ case ZEND_VERIFY_ABSTRACT_CLASS: case ZEND_ADD_INTERFACE: case ZEND_ADD_TRAIT: + case ZEND_SPECIALIZE_TRAIT: case ZEND_BIND_TRAITS: /* We currently don't early-bind classes that implement interfaces */ /* Classes with traits are handled exactly the same, no early-bind here */ @@ -6226,6 +6227,92 @@ void zend_compile_use_trait(zend_ast *ast) /* {{{ */ } /* }}} */ +HashTable * zend_compile_type_parameters(zend_ast *ast) /* {{{ */ +{ + HashTable *result; + zend_ast_list *list = zend_ast_get_list(ast); + uint32_t i; + + ZEND_ASSERT(ast->kind == ZEND_AST_NAME_LIST); + + result = zend_new_array(list->children); + for (i = 0; i < list->children; ++i) { + zend_ast *elem_ast = list->child[i]; + zend_string * value = zend_ast_get_str(elem_ast); + zval tmp; + ZVAL_STR(&tmp, value); + zend_hash_index_update(result, i, &tmp); + } + return result; +} +/* }}} */ + +void zend_compile_parameterized_trait(znode *result, zend_ast *ast) /* {{{ */ +{ + zend_ast *trait_ast = ast->child[0]; + zend_ast * parameters_ast = ast->child[1]; + zend_ast_list *adaptations = ast->child[2] ? zend_ast_get_list(ast->child[2]) : NULL; + + zend_class_entry *ce = CG(active_class_entry); + zend_op *opline; + znode specialized_node, parameters_node; + HashTable * parameters_table; + uint32_t i; + + zend_string *name = zend_ast_get_str(trait_ast); + + if (ce->ce_flags & ZEND_ACC_INTERFACE) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use traits inside of interfaces. " + "%s is used in %s", ZSTR_VAL(name), ZSTR_VAL(ce->name)); + } + + switch (zend_get_class_fetch_type(name)) { + case ZEND_FETCH_CLASS_SELF: + case ZEND_FETCH_CLASS_PARENT: + case ZEND_FETCH_CLASS_STATIC: + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as trait name " + "as it is reserved", ZSTR_VAL(name)); + break; + } + + parameters_table = zend_compile_type_parameters(parameters_ast); + parameters_node.op_type = IS_CONST; + ZVAL_ARR(¶meters_node.u.constant, parameters_table); + + /* todo: specialize method signatures and bodies + * Maybe: + * SPECIALIZE_TRAIT "TraitName" ["string", "int"] @1 + * ADD_TRAIT @0 @1 + */ + opline = zend_emit_op(&specialized_node, ZEND_SPECIALIZE_TRAIT, NULL, ¶meters_node); + opline->op1_type = IS_CONST; + opline->op1.constant = zend_add_class_name_literal(CG(active_op_array), + zend_resolve_class_name_ast(trait_ast)); + + + zend_emit_op(NULL, ZEND_ADD_TRAIT, &FC(implementing_class), &specialized_node); + + ce->num_traits++; + + if (!adaptations) { + return; + } + + for (i = 0; i < adaptations->children; ++i) { + zend_ast *adaptation_ast = adaptations->child[i]; + switch (adaptation_ast->kind) { + case ZEND_AST_TRAIT_PRECEDENCE: + zend_compile_trait_precedence(adaptation_ast); + break; + case ZEND_AST_TRAIT_ALIAS: + zend_compile_trait_alias(adaptation_ast); + break; + EMPTY_SWITCH_DEFAULT_CASE() + } + } +} +/* }}} */ + void zend_compile_implements(znode *class_node, zend_ast *ast) /* {{{ */ { zend_ast_list *list = zend_ast_get_list(ast); @@ -6251,6 +6338,25 @@ void zend_compile_implements(znode *class_node, zend_ast *ast) /* {{{ */ } /* }}} */ +void zend_compile_type_arguments(znode *class_node, zend_ast *ast) /* {{{ */ +{ + zend_ast_list *list = zend_ast_get_list(ast); + uint32_t i; + for (i = 0; i < list->children; ++i) { + zend_ast *class_ast = list->child[i]; + zend_string *name = zend_ast_get_str(class_ast); + if (!zend_is_const_default_class_ref(class_ast)) { + zend_error_noreturn(E_COMPILE_ERROR, + "Cannot use '%s' as type parameter name as it is reserved", ZSTR_VAL(name)); + } + + // todo: store type parameters on CE + + CG(active_class_entry)->num_interfaces++; + } +} +/* }}} */ + static zend_string *zend_generate_anon_class_name(unsigned char *lex_pos) /* {{{ */ { zend_string *result; @@ -6275,6 +6381,7 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */ zend_class_entry *ce = zend_arena_alloc(&CG(arena), sizeof(zend_class_entry)); zend_op *opline; znode declare_node, extends_node; + zend_bool is_trait = (decl->flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT; zend_class_entry *original_ce = CG(active_class_entry); znode original_implementing_class = FC(implementing_class); @@ -6437,15 +6544,17 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */ zend_emit_op(NULL, ZEND_BIND_TRAITS, &declare_node, NULL); } - if (implements_ast) { + if (is_trait) { + zend_compile_type_arguments(&declare_node, implements_ast); + } else if (implements_ast) { zend_compile_implements(&declare_node, implements_ast); } if (!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) - && (extends_ast || implements_ast) + && (extends_ast || (implements_ast && !is_trait)) ) { zend_verify_abstract_class(ce); - if (implements_ast) { + if (implements_ast && !is_trait) { zend_emit_op(NULL, ZEND_VERIFY_ABSTRACT_CLASS, &declare_node, NULL); } } @@ -6454,7 +6563,7 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */ * will restore it during actual implementation. * The ZEND_ACC_IMPLEMENT_INTERFACES flag disables double call to * zend_verify_abstract_class() */ - if (ce->num_interfaces > 0) { + if (!is_trait && ce->num_interfaces > 0) { ce->interfaces = NULL; ce->num_interfaces = 0; ce->ce_flags |= ZEND_ACC_IMPLEMENT_INTERFACES; @@ -8272,6 +8381,9 @@ void zend_compile_expr(znode *result, zend_ast *ast) /* {{{ */ case ZEND_AST_CONDITIONAL: zend_compile_conditional(result, ast); return; + case ZEND_AST_USE_PARAMETERIZED_TRAIT: + zend_compile_parameterized_trait(result, ast); + return; case ZEND_AST_COALESCE: zend_compile_coalesce(result, ast); return; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6d11afc..d2d2d1c 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -253,6 +253,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %type <ast> array_pair non_empty_array_pair_list array_pair_list possible_array_pair %type <ast> isset_variable type return_type type_expr %type <ast> identifier +%type <ast> generic_type_parameters generic_type_parameter_list %type <num> returns_ref function is_reference is_variadic variable_modifiers %type <num> method_modifiers non_empty_member_modifiers member_modifier @@ -519,10 +520,22 @@ class_modifier: | T_FINAL { $$ = ZEND_ACC_FINAL; } ; +generic_type_parameter_list: + T_STRING + { $$ = zend_ast_create_list(1, ZEND_AST_NAME_LIST, $1); } + | generic_type_parameter_list ',' T_STRING + { $$ = zend_ast_list_add($1, $3); } +; + +generic_type_parameters: + /* empty */ { $$ = zend_ast_create_list(0, ZEND_AST_NAME_LIST); } + | '<' generic_type_parameter_list '>' { $$ = $2; } + | '<' generic_type_parameter_list ',' '>' { $$ = $2; } +; + trait_declaration_statement: - T_TRAIT { $<num>$ = CG(zend_lineno); } - T_STRING backup_doc_comment '{' class_statement_list '}' - { $$ = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_TRAIT, $<num>2, $4, zend_ast_get_str($3), NULL, NULL, $6, NULL); } + T_TRAIT { $<num>$ = CG(zend_lineno); } T_STRING generic_type_parameters backup_doc_comment '{' class_statement_list '}' + { $$ = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_TRAIT, $<num>2, $5, zend_ast_get_str($3), NULL, $4, $7, NULL); } ; interface_declaration_statement: @@ -714,7 +727,6 @@ class_statement_list: { $$ = zend_ast_create_list(0, ZEND_AST_STMT_LIST); } ; - class_statement: variable_modifiers property_list ';' { $$ = $2; $$->attr = $1; } @@ -722,6 +734,8 @@ class_statement: { $$ = $3; $$->attr = $1; } | T_USE name_list trait_adaptations { $$ = zend_ast_create(ZEND_AST_USE_TRAIT, $2, $3); } + | T_USE T_STRING '<' name_list '>' trait_adaptations + { $$ = zend_ast_create(ZEND_AST_USE_PARAMETERIZED_TRAIT, $2, $4, $6); } | method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags { $$ = zend_ast_create_decl(ZEND_AST_METHOD, $3 | $1 | $12, $2, $5, diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 1830720..0246d2d 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -6958,17 +6958,19 @@ ZEND_VM_HANDLER(144, ZEND_ADD_INTERFACE, ANY, CONST) ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } -ZEND_VM_HANDLER(154, ZEND_ADD_TRAIT, ANY, ANY) +ZEND_VM_HANDLER(198, ZEND_SPECIALIZE_TRAIT, ANY, CONST) { USE_OPLINE zend_class_entry *ce = Z_CE_P(EX_VAR(opline->op1.var)); - zend_class_entry *trait; + zend_class_entry *trait, *specialized_trait; + HashTable * type_parameters; SAVE_OPLINE(); - trait = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2))); + + trait = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1))); if (UNEXPECTED(trait == NULL)) { - trait = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op2)), - RT_CONSTANT(opline, opline->op2) + 1, + trait = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op1)), + RT_CONSTANT(opline, opline->op1) + 1, ZEND_FETCH_CLASS_TRAIT); if (UNEXPECTED(trait == NULL)) { ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -6976,7 +6978,48 @@ ZEND_VM_HANDLER(154, ZEND_ADD_TRAIT, ANY, ANY) if (!(trait->ce_flags & ZEND_ACC_TRAIT)) { zend_error_noreturn(E_ERROR, "%s cannot use %s - it is not a trait", ZSTR_VAL(ce->name), ZSTR_VAL(trait->name)); } - CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2)), trait); + CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1)), trait); + } + + type_parameters = Z_ARRVAL_P(GET_OP2_ZVAL_PTR(BP_VAR_R)); + if (zend_hash_num_elements(type_parameters) != trait->num_interfaces) { + zend_error_noreturn(E_ERROR, + "Number of type arguments %d does not match expected %d", + zend_hash_num_elements(type_parameters), + trait->num_interfaces + ); + } + // todo: actually specialize + specialized_trait = trait; + + Z_CE_P(EX_VAR(opline->result.var)) = specialized_trait; + + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); +} + +ZEND_VM_HANDLER(154, ZEND_ADD_TRAIT, ANY, ANY) +{ + USE_OPLINE + zend_class_entry *ce = Z_CE_P(EX_VAR(opline->op1.var)); + zend_class_entry *trait; + + SAVE_OPLINE(); + if (opline->op2_type == IS_CONST) { + trait = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2))); + if (UNEXPECTED(trait == NULL)) { + trait = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op2)), + RT_CONSTANT(opline, opline->op2) + 1, + ZEND_FETCH_CLASS_TRAIT); + if (UNEXPECTED(trait == NULL)) { + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + } + if (!(trait->ce_flags & ZEND_ACC_TRAIT)) { + zend_error_noreturn(E_ERROR, "%s cannot use %s - it is not a trait", ZSTR_VAL(ce->name), ZSTR_VAL(trait->name)); + } + CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2)), trait); + } + } else { + trait = Z_CE_P(EX_VAR(opline->op2.var)); } zend_do_implement_trait(ce, trait); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 80109fb..9fe6f9d 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1652,18 +1652,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_TRAIT_SPEC_HANDLER(ZEND_OP zend_class_entry *trait; SAVE_OPLINE(); - trait = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2))); - if (UNEXPECTED(trait == NULL)) { - trait = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op2)), - RT_CONSTANT(opline, opline->op2) + 1, - ZEND_FETCH_CLASS_TRAIT); + if (opline->op2_type == IS_CONST) { + trait = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2))); if (UNEXPECTED(trait == NULL)) { - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); - } - if (!(trait->ce_flags & ZEND_ACC_TRAIT)) { - zend_error_noreturn(E_ERROR, "%s cannot use %s - it is not a trait", ZSTR_VAL(ce->name), ZSTR_VAL(trait->name)); + trait = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op2)), + RT_CONSTANT(opline, opline->op2) + 1, + ZEND_FETCH_CLASS_TRAIT); + if (UNEXPECTED(trait == NULL)) { + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + } + if (!(trait->ce_flags & ZEND_ACC_TRAIT)) { + zend_error_noreturn(E_ERROR, "%s cannot use %s - it is not a trait", ZSTR_VAL(ce->name), ZSTR_VAL(trait->name)); + } + CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2)), trait); } - CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2)), trait); + } else { + trait = Z_CE_P(EX_VAR(opline->op2.var)); } zend_do_implement_trait(ce, trait); @@ -2347,6 +2351,45 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_INTERFACE_SPEC_CONST_HANDL ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SPECIALIZE_TRAIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_class_entry *ce = Z_CE_P(EX_VAR(opline->op1.var)); + zend_class_entry *trait, *specialized_trait; + HashTable * type_parameters; + + SAVE_OPLINE(); + + trait = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1))); + if (UNEXPECTED(trait == NULL)) { + trait = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op1)), + RT_CONSTANT(opline, opline->op1) + 1, + ZEND_FETCH_CLASS_TRAIT); + if (UNEXPECTED(trait == NULL)) { + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + } + if (!(trait->ce_flags & ZEND_ACC_TRAIT)) { + zend_error_noreturn(E_ERROR, "%s cannot use %s - it is not a trait", ZSTR_VAL(ce->name), ZSTR_VAL(trait->name)); + } + CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1)), trait); + } + + type_parameters = Z_ARRVAL_P(RT_CONSTANT(opline, opline->op2)); + if (zend_hash_num_elements(type_parameters) != trait->num_interfaces) { + zend_error_noreturn(E_ERROR, + "Number of type arguments %d does not match expected %d", + zend_hash_num_elements(type_parameters), + trait->num_interfaces + ); + } + // todo: actually specialize + specialized_trait = trait; + + Z_CE_P(EX_VAR(opline->result.var)) = specialized_trait; + + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); +} + static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DECLARE_INHERITED_CLASS_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -58952,6 +58995,11 @@ ZEND_API void execute_ex(zend_execute_data *ex) (void*)&&ZEND_NULL_LABEL, (void*)&&ZEND_ISSET_ISEMPTY_CV_SPEC_CV_UNUSED_LABEL, (void*)&&ZEND_NULL_LABEL, + (void*)&&ZEND_SPECIALIZE_TRAIT_SPEC_CONST_LABEL, + (void*)&&ZEND_NULL_LABEL, + (void*)&&ZEND_NULL_LABEL, + (void*)&&ZEND_NULL_LABEL, + (void*)&&ZEND_NULL_LABEL, (void*)&&ZEND_NULL_LABEL, (void*)&&ZEND_ADD_LONG_NO_OVERFLOW_SPEC_CONST_TMPVARCV_LABEL, (void*)&&ZEND_ADD_LONG_NO_OVERFLOW_SPEC_CONST_TMPVARCV_LABEL, @@ -60121,6 +60169,9 @@ ZEND_API void execute_ex(zend_execute_data *ex) HYBRID_CASE(ZEND_ADD_INTERFACE_SPEC_CONST): ZEND_ADD_INTERFACE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); HYBRID_BREAK(); + HYBRID_CASE(ZEND_SPECIALIZE_TRAIT_SPEC_CONST): + ZEND_SPECIALIZE_TRAIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + HYBRID_BREAK(); HYBRID_CASE(ZEND_DECLARE_INHERITED_CLASS_SPEC_VAR): ZEND_DECLARE_INHERITED_CLASS_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); HYBRID_BREAK(); @@ -67942,6 +67993,11 @@ void zend_init_opcodes_handlers(void) ZEND_NULL_HANDLER, ZEND_ISSET_ISEMPTY_CV_SPEC_CV_UNUSED_HANDLER, ZEND_NULL_HANDLER, + ZEND_SPECIALIZE_TRAIT_SPEC_CONST_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, ZEND_NULL_HANDLER, ZEND_ADD_LONG_NO_OVERFLOW_SPEC_CONST_TMPVARCV_HANDLER, ZEND_ADD_LONG_NO_OVERFLOW_SPEC_CONST_TMPVARCV_HANDLER, @@ -69060,7 +69116,7 @@ void zend_init_opcodes_handlers(void) 2257 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 2282 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 2307 | SPEC_RULE_OP1 | SPEC_RULE_OP2, - 4921, + 4926, 2332, 2333, 2334, @@ -69145,7 +69201,7 @@ void zend_init_opcodes_handlers(void) 3531 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3556 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3581 | SPEC_RULE_OP1 | SPEC_RULE_OP2, - 4921, + 4926, 3606 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3631 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3656 | SPEC_RULE_OP1 | SPEC_RULE_OP2, @@ -69158,7 +69214,8 @@ void zend_init_opcodes_handlers(void) 3831 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3856 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3881 | SPEC_RULE_OP1 | SPEC_RULE_OP2, - 4921 + 3906 | SPEC_RULE_OP2, + 4926 }; #if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) zend_opcode_handler_funcs = labels; @@ -69353,7 +69410,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 3906 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 3911 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69361,7 +69418,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 3931 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 3936 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69369,7 +69426,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 3956 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 3961 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69380,17 +69437,17 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 3981 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 3986 | SPEC_RULE_OP1 | SPEC_RULE_OP2; } else if (op1_info == MAY_BE_LONG && op2_info == MAY_BE_LONG) { if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4006 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4011 | SPEC_RULE_OP1 | SPEC_RULE_OP2; } else if (op1_info == MAY_BE_DOUBLE && op2_info == MAY_BE_DOUBLE) { if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4031 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4036 | SPEC_RULE_OP1 | SPEC_RULE_OP2; } break; case ZEND_MUL: @@ -69398,7 +69455,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4056 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4061 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69406,7 +69463,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4081 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4086 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69414,7 +69471,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4106 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4111 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69425,7 +69482,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4131 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4136 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69433,7 +69490,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4206 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4211 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69444,7 +69501,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4281 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4286 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69452,7 +69509,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4356 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4361 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69463,12 +69520,12 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4431 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4436 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; } else if (op1_info == MAY_BE_DOUBLE && op2_info == MAY_BE_DOUBLE) { if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4506 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4511 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; } break; case ZEND_IS_SMALLER_OR_EQUAL: @@ -69476,75 +69533,75 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4581 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4586 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; } else if (op1_info == MAY_BE_DOUBLE && op2_info == MAY_BE_DOUBLE) { if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4656 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4661 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; } break; case ZEND_QM_ASSIGN: if (op1_info == MAY_BE_DOUBLE) { - spec = 4821 | SPEC_RULE_OP1; - } else if (!(op1_info & ((MAY_BE_ANY|MAY_BE_UNDEF)-(MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE)))) { spec = 4826 | SPEC_RULE_OP1; + } else if (!(op1_info & ((MAY_BE_ANY|MAY_BE_UNDEF)-(MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE)))) { + spec = 4831 | SPEC_RULE_OP1; } break; case ZEND_PRE_INC: if (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG) { - spec = 4731 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4736 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } else if (op1_info == MAY_BE_LONG) { - spec = 4741 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4746 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { - spec = 4751 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4756 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } break; case ZEND_PRE_DEC: if (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG) { - spec = 4761 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4766 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } else if (op1_info == MAY_BE_LONG) { - spec = 4771 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4776 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { - spec = 4781 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4786 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } break; case ZEND_POST_INC: if (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG) { - spec = 4791 | SPEC_RULE_OP1; - } else if (op1_info == MAY_BE_LONG) { spec = 4796 | SPEC_RULE_OP1; - } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { + } else if (op1_info == MAY_BE_LONG) { spec = 4801 | SPEC_RULE_OP1; + } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { + spec = 4806 | SPEC_RULE_OP1; } break; case ZEND_POST_DEC: if (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG) { - spec = 4806 | SPEC_RULE_OP1; - } else if (op1_info == MAY_BE_LONG) { spec = 4811 | SPEC_RULE_OP1; - } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { + } else if (op1_info == MAY_BE_LONG) { spec = 4816 | SPEC_RULE_OP1; + } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { + spec = 4821 | SPEC_RULE_OP1; } break; case ZEND_SEND_VAR_EX: if ((op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) == 0) { - spec = 4861 | SPEC_RULE_OP1 | SPEC_RULE_QUICK_ARG; + spec = 4866 | SPEC_RULE_OP1 | SPEC_RULE_QUICK_ARG; } break; case ZEND_FE_FETCH_R: if (op->op2_type == IS_CV && (op1_info & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF)) == MAY_BE_ARRAY) { - spec = 4871 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_RETVAL; + spec = 4876 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_RETVAL; } break; case ZEND_FETCH_DIM_R: if (!(op2_info & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF))) { - spec = 4831 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4836 | SPEC_RULE_OP1 | SPEC_RULE_OP2; } break; case ZEND_SEND_VAR: if ((op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) == 0) { - spec = 4856 | SPEC_RULE_OP1; + spec = 4861 | SPEC_RULE_OP1; } break; default: diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c index ecfe464..ef97a67 100644 --- a/Zend/zend_vm_opcodes.c +++ b/Zend/zend_vm_opcodes.c @@ -21,7 +21,7 @@ #include <stdio.h> #include <zend.h> -static const char *zend_vm_opcodes_names[198] = { +static const char *zend_vm_opcodes_names[199] = { "ZEND_NOP", "ZEND_ADD", "ZEND_SUB", @@ -220,9 +220,10 @@ static const char *zend_vm_opcodes_names[198] = { "ZEND_FUNC_GET_ARGS", "ZEND_UNSET_CV", "ZEND_ISSET_ISEMPTY_CV", + "ZEND_SPECIALIZE_TRAIT", }; -static uint32_t zend_vm_opcodes_flags[198] = { +static uint32_t zend_vm_opcodes_flags[199] = { 0x00000000, 0x00000707, 0x00000707, @@ -421,6 +422,7 @@ static uint32_t zend_vm_opcodes_flags[198] = { 0x00000103, 0x00000101, 0x00020101, + 0x00000300, }; ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) { diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h index 3be3641..13a913a 100644 --- a/Zend/zend_vm_opcodes.h +++ b/Zend/zend_vm_opcodes.h @@ -269,7 +269,8 @@ END_EXTERN_C() #define ZEND_FUNC_GET_ARGS 195 #define ZEND_UNSET_CV 196 #define ZEND_ISSET_ISEMPTY_CV 197 +#define ZEND_SPECIALIZE_TRAIT 198 -#define ZEND_VM_LAST_OPCODE 197 +#define ZEND_VM_LAST_OPCODE 198 #endif
use and
figure out how to apply the generic type parameter to things such
as T::class, new T(), etc.
Changing the signature should not be too difficult. We have to copy
the method entry when using a trait anyway so adjust the types there.
Changed paths:
M Zend/zend.h
M Zend/zend_ast.h
M Zend/zend_compile.c
M Zend/zend_language_parser.y
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
M Zend/zend_vm_opcodes.c
M Zend/zend_vm_opcodes.h
diff --git a/Zend/zend.h b/Zend/zend.h index 3cd5036..5fc1980 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -156,7 +156,13 @@ struct _zend_class_entry { uint32_t num_interfaces; uint32_t num_traits; - zend_class_entry **interfaces; + + union { + zend_class_entry **interfaces; + + /* trait definitons hold the names here */ + zend_string **type_parameters; + }; zend_class_entry **traits; zend_trait_alias **trait_aliases; diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 99ad920..0527c3a 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -137,6 +137,7 @@ enum _zend_ast_kind { ZEND_AST_METHOD_CALL = 3 << ZEND_AST_NUM_CHILDREN_SHIFT, ZEND_AST_STATIC_CALL, ZEND_AST_CONDITIONAL, + ZEND_AST_USE_PARAMETERIZED_TRAIT, ZEND_AST_TRY, ZEND_AST_CATCH, diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 85d5abb..2160070 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1236,6 +1236,7 @@ void zend_do_early_binding(void) /* {{{ */ case ZEND_VERIFY_ABSTRACT_CLASS: case ZEND_ADD_INTERFACE: case ZEND_ADD_TRAIT: + case ZEND_SPECIALIZE_TRAIT: case ZEND_BIND_TRAITS: /* We currently don't early-bind classes that implement interfaces */ /* Classes with traits are handled exactly the same, no early-bind here */ @@ -6226,6 +6227,92 @@ void zend_compile_use_trait(zend_ast *ast) /* {{{ */ } /* }}} */ +HashTable * zend_compile_type_parameters(zend_ast *ast) /* {{{ */ +{ + HashTable *result; + zend_ast_list *list = zend_ast_get_list(ast); + uint32_t i; + + ZEND_ASSERT(ast->kind == ZEND_AST_NAME_LIST); + + result = zend_new_array(list->children); + for (i = 0; i < list->children; ++i) { + zend_ast *elem_ast = list->child[i]; + zend_string * value = zend_ast_get_str(elem_ast); + zval tmp; + ZVAL_STR(&tmp, value); + zend_hash_index_update(result, i, &tmp); + } + return result; +} +/* }}} */ + +void zend_compile_parameterized_trait(znode *result, zend_ast *ast) /* {{{ */ +{ + zend_ast *trait_ast = ast->child[0]; + zend_ast * parameters_ast = ast->child[1]; + zend_ast_list *adaptations = ast->child[2] ? zend_ast_get_list(ast->child[2]) : NULL; + + zend_class_entry *ce = CG(active_class_entry); + zend_op *opline; + znode specialized_node, parameters_node; + HashTable * parameters_table; + uint32_t i; + + zend_string *name = zend_ast_get_str(trait_ast); + + if (ce->ce_flags & ZEND_ACC_INTERFACE) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use traits inside of interfaces. " + "%s is used in %s", ZSTR_VAL(name), ZSTR_VAL(ce->name)); + } + + switch (zend_get_class_fetch_type(name)) { + case ZEND_FETCH_CLASS_SELF: + case ZEND_FETCH_CLASS_PARENT: + case ZEND_FETCH_CLASS_STATIC: + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as trait name " + "as it is reserved", ZSTR_VAL(name)); + break; + } + + parameters_table = zend_compile_type_parameters(parameters_ast); + parameters_node.op_type = IS_CONST; + ZVAL_ARR(¶meters_node.u.constant, parameters_table); + + /* todo: specialize method signatures and bodies + * Maybe: + * SPECIALIZE_TRAIT "TraitName" ["string", "int"] @1 + * ADD_TRAIT @0 @1 + */ + opline = zend_emit_op(&specialized_node, ZEND_SPECIALIZE_TRAIT, NULL, ¶meters_node); + opline->op1_type = IS_CONST; + opline->op1.constant = zend_add_class_name_literal(CG(active_op_array), + zend_resolve_class_name_ast(trait_ast)); + + + zend_emit_op(NULL, ZEND_ADD_TRAIT, &FC(implementing_class), &specialized_node); + + ce->num_traits++; + + if (!adaptations) { + return; + } + + for (i = 0; i < adaptations->children; ++i) { + zend_ast *adaptation_ast = adaptations->child[i]; + switch (adaptation_ast->kind) { + case ZEND_AST_TRAIT_PRECEDENCE: + zend_compile_trait_precedence(adaptation_ast); + break; + case ZEND_AST_TRAIT_ALIAS: + zend_compile_trait_alias(adaptation_ast); + break; + EMPTY_SWITCH_DEFAULT_CASE() + } + } +} +/* }}} */ + void zend_compile_implements(znode *class_node, zend_ast *ast) /* {{{ */ { zend_ast_list *list = zend_ast_get_list(ast); @@ -6251,6 +6338,25 @@ void zend_compile_implements(znode *class_node, zend_ast *ast) /* {{{ */ } /* }}} */ +void zend_compile_type_arguments(znode *class_node, zend_ast *ast) /* {{{ */ +{ + zend_ast_list *list = zend_ast_get_list(ast); + uint32_t i; + for (i = 0; i < list->children; ++i) { + zend_ast *class_ast = list->child[i]; + zend_string *name = zend_ast_get_str(class_ast); + if (!zend_is_const_default_class_ref(class_ast)) { + zend_error_noreturn(E_COMPILE_ERROR, + "Cannot use '%s' as type parameter name as it is reserved", ZSTR_VAL(name)); + } + + // todo: store type parameters on CE + + CG(active_class_entry)->num_interfaces++; + } +} +/* }}} */ + static zend_string *zend_generate_anon_class_name(unsigned char *lex_pos) /* {{{ */ { zend_string *result; @@ -6275,6 +6381,7 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */ zend_class_entry *ce = zend_arena_alloc(&CG(arena), sizeof(zend_class_entry)); zend_op *opline; znode declare_node, extends_node; + zend_bool is_trait = (decl->flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT; zend_class_entry *original_ce = CG(active_class_entry); znode original_implementing_class = FC(implementing_class); @@ -6437,15 +6544,17 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */ zend_emit_op(NULL, ZEND_BIND_TRAITS, &declare_node, NULL); } - if (implements_ast) { + if (is_trait) { + zend_compile_type_arguments(&declare_node, implements_ast); + } else if (implements_ast) { zend_compile_implements(&declare_node, implements_ast); } if (!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) - && (extends_ast || implements_ast) + && (extends_ast || (implements_ast && !is_trait)) ) { zend_verify_abstract_class(ce); - if (implements_ast) { + if (implements_ast && !is_trait) { zend_emit_op(NULL, ZEND_VERIFY_ABSTRACT_CLASS, &declare_node, NULL); } } @@ -6454,7 +6563,7 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */ * will restore it during actual implementation. * The ZEND_ACC_IMPLEMENT_INTERFACES flag disables double call to * zend_verify_abstract_class() */ - if (ce->num_interfaces > 0) { + if (!is_trait && ce->num_interfaces > 0) { ce->interfaces = NULL; ce->num_interfaces = 0; ce->ce_flags |= ZEND_ACC_IMPLEMENT_INTERFACES; @@ -8272,6 +8381,9 @@ void zend_compile_expr(znode *result, zend_ast *ast) /* {{{ */ case ZEND_AST_CONDITIONAL: zend_compile_conditional(result, ast); return; + case ZEND_AST_USE_PARAMETERIZED_TRAIT: + zend_compile_parameterized_trait(result, ast); + return; case ZEND_AST_COALESCE: zend_compile_coalesce(result, ast); return; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6d11afc..d2d2d1c 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -253,6 +253,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %type <ast> array_pair non_empty_array_pair_list array_pair_list possible_array_pair %type <ast> isset_variable type return_type type_expr %type <ast> identifier +%type <ast> generic_type_parameters generic_type_parameter_list %type <num> returns_ref function is_reference is_variadic variable_modifiers %type <num> method_modifiers non_empty_member_modifiers member_modifier @@ -519,10 +520,22 @@ class_modifier: | T_FINAL { $$ = ZEND_ACC_FINAL; } ; +generic_type_parameter_list: + T_STRING + { $$ = zend_ast_create_list(1, ZEND_AST_NAME_LIST, $1); } + | generic_type_parameter_list ',' T_STRING + { $$ = zend_ast_list_add($1, $3); } +; + +generic_type_parameters: + /* empty */ { $$ = zend_ast_create_list(0, ZEND_AST_NAME_LIST); } + | '<' generic_type_parameter_list '>' { $$ = $2; } + | '<' generic_type_parameter_list ',' '>' { $$ = $2; } +; + trait_declaration_statement: - T_TRAIT { $<num>$ = CG(zend_lineno); } - T_STRING backup_doc_comment '{' class_statement_list '}' - { $$ = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_TRAIT, $<num>2, $4, zend_ast_get_str($3), NULL, NULL, $6, NULL); } + T_TRAIT { $<num>$ = CG(zend_lineno); } T_STRING generic_type_parameters backup_doc_comment '{' class_statement_list '}' + { $$ = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_TRAIT, $<num>2, $5, zend_ast_get_str($3), NULL, $4, $7, NULL); } ; interface_declaration_statement: @@ -714,7 +727,6 @@ class_statement_list: { $$ = zend_ast_create_list(0, ZEND_AST_STMT_LIST); } ; - class_statement: variable_modifiers property_list ';' { $$ = $2; $$->attr = $1; } @@ -722,6 +734,8 @@ class_statement: { $$ = $3; $$->attr = $1; } | T_USE name_list trait_adaptations { $$ = zend_ast_create(ZEND_AST_USE_TRAIT, $2, $3); } + | T_USE T_STRING '<' name_list '>' trait_adaptations + { $$ = zend_ast_create(ZEND_AST_USE_PARAMETERIZED_TRAIT, $2, $4, $6); } | method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags method_body backup_fn_flags { $$ = zend_ast_create_decl(ZEND_AST_METHOD, $3 | $1 | $12, $2, $5, diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 1830720..0246d2d 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -6958,17 +6958,19 @@ ZEND_VM_HANDLER(144, ZEND_ADD_INTERFACE, ANY, CONST) ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } -ZEND_VM_HANDLER(154, ZEND_ADD_TRAIT, ANY, ANY) +ZEND_VM_HANDLER(198, ZEND_SPECIALIZE_TRAIT, ANY, CONST) { USE_OPLINE zend_class_entry *ce = Z_CE_P(EX_VAR(opline->op1.var)); - zend_class_entry *trait; + zend_class_entry *trait, *specialized_trait; + HashTable * type_parameters; SAVE_OPLINE(); - trait = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2))); + + trait = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1))); if (UNEXPECTED(trait == NULL)) { - trait = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op2)), - RT_CONSTANT(opline, opline->op2) + 1, + trait = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op1)), + RT_CONSTANT(opline, opline->op1) + 1, ZEND_FETCH_CLASS_TRAIT); if (UNEXPECTED(trait == NULL)) { ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -6976,7 +6978,48 @@ ZEND_VM_HANDLER(154, ZEND_ADD_TRAIT, ANY, ANY) if (!(trait->ce_flags & ZEND_ACC_TRAIT)) { zend_error_noreturn(E_ERROR, "%s cannot use %s - it is not a trait", ZSTR_VAL(ce->name), ZSTR_VAL(trait->name)); } - CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2)), trait); + CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1)), trait); + } + + type_parameters = Z_ARRVAL_P(GET_OP2_ZVAL_PTR(BP_VAR_R)); + if (zend_hash_num_elements(type_parameters) != trait->num_interfaces) { + zend_error_noreturn(E_ERROR, + "Number of type arguments %d does not match expected %d", + zend_hash_num_elements(type_parameters), + trait->num_interfaces + ); + } + // todo: actually specialize + specialized_trait = trait; + + Z_CE_P(EX_VAR(opline->result.var)) = specialized_trait; + + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); +} + +ZEND_VM_HANDLER(154, ZEND_ADD_TRAIT, ANY, ANY) +{ + USE_OPLINE + zend_class_entry *ce = Z_CE_P(EX_VAR(opline->op1.var)); + zend_class_entry *trait; + + SAVE_OPLINE(); + if (opline->op2_type == IS_CONST) { + trait = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2))); + if (UNEXPECTED(trait == NULL)) { + trait = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op2)), + RT_CONSTANT(opline, opline->op2) + 1, + ZEND_FETCH_CLASS_TRAIT); + if (UNEXPECTED(trait == NULL)) { + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + } + if (!(trait->ce_flags & ZEND_ACC_TRAIT)) { + zend_error_noreturn(E_ERROR, "%s cannot use %s - it is not a trait", ZSTR_VAL(ce->name), ZSTR_VAL(trait->name)); + } + CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2)), trait); + } + } else { + trait = Z_CE_P(EX_VAR(opline->op2.var)); } zend_do_implement_trait(ce, trait); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 80109fb..9fe6f9d 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1652,18 +1652,22 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_TRAIT_SPEC_HANDLER(ZEND_OP zend_class_entry *trait; SAVE_OPLINE(); - trait = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2))); - if (UNEXPECTED(trait == NULL)) { - trait = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op2)), - RT_CONSTANT(opline, opline->op2) + 1, - ZEND_FETCH_CLASS_TRAIT); + if (opline->op2_type == IS_CONST) { + trait = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2))); if (UNEXPECTED(trait == NULL)) { - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); - } - if (!(trait->ce_flags & ZEND_ACC_TRAIT)) { - zend_error_noreturn(E_ERROR, "%s cannot use %s - it is not a trait", ZSTR_VAL(ce->name), ZSTR_VAL(trait->name)); + trait = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op2)), + RT_CONSTANT(opline, opline->op2) + 1, + ZEND_FETCH_CLASS_TRAIT); + if (UNEXPECTED(trait == NULL)) { + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + } + if (!(trait->ce_flags & ZEND_ACC_TRAIT)) { + zend_error_noreturn(E_ERROR, "%s cannot use %s - it is not a trait", ZSTR_VAL(ce->name), ZSTR_VAL(trait->name)); + } + CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2)), trait); } - CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2)), trait); + } else { + trait = Z_CE_P(EX_VAR(opline->op2.var)); } zend_do_implement_trait(ce, trait); @@ -2347,6 +2351,45 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_INTERFACE_SPEC_CONST_HANDL ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SPECIALIZE_TRAIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_class_entry *ce = Z_CE_P(EX_VAR(opline->op1.var)); + zend_class_entry *trait, *specialized_trait; + HashTable * type_parameters; + + SAVE_OPLINE(); + + trait = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1))); + if (UNEXPECTED(trait == NULL)) { + trait = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op1)), + RT_CONSTANT(opline, opline->op1) + 1, + ZEND_FETCH_CLASS_TRAIT); + if (UNEXPECTED(trait == NULL)) { + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + } + if (!(trait->ce_flags & ZEND_ACC_TRAIT)) { + zend_error_noreturn(E_ERROR, "%s cannot use %s - it is not a trait", ZSTR_VAL(ce->name), ZSTR_VAL(trait->name)); + } + CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1)), trait); + } + + type_parameters = Z_ARRVAL_P(RT_CONSTANT(opline, opline->op2)); + if (zend_hash_num_elements(type_parameters) != trait->num_interfaces) { + zend_error_noreturn(E_ERROR, + "Number of type arguments %d does not match expected %d", + zend_hash_num_elements(type_parameters), + trait->num_interfaces + ); + } + // todo: actually specialize + specialized_trait = trait; + + Z_CE_P(EX_VAR(opline->result.var)) = specialized_trait; + + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); +} + static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DECLARE_INHERITED_CLASS_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -58952,6 +58995,11 @@ ZEND_API void execute_ex(zend_execute_data *ex) (void*)&&ZEND_NULL_LABEL, (void*)&&ZEND_ISSET_ISEMPTY_CV_SPEC_CV_UNUSED_LABEL, (void*)&&ZEND_NULL_LABEL, + (void*)&&ZEND_SPECIALIZE_TRAIT_SPEC_CONST_LABEL, + (void*)&&ZEND_NULL_LABEL, + (void*)&&ZEND_NULL_LABEL, + (void*)&&ZEND_NULL_LABEL, + (void*)&&ZEND_NULL_LABEL, (void*)&&ZEND_NULL_LABEL, (void*)&&ZEND_ADD_LONG_NO_OVERFLOW_SPEC_CONST_TMPVARCV_LABEL, (void*)&&ZEND_ADD_LONG_NO_OVERFLOW_SPEC_CONST_TMPVARCV_LABEL, @@ -60121,6 +60169,9 @@ ZEND_API void execute_ex(zend_execute_data *ex) HYBRID_CASE(ZEND_ADD_INTERFACE_SPEC_CONST): ZEND_ADD_INTERFACE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); HYBRID_BREAK(); + HYBRID_CASE(ZEND_SPECIALIZE_TRAIT_SPEC_CONST): + ZEND_SPECIALIZE_TRAIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + HYBRID_BREAK(); HYBRID_CASE(ZEND_DECLARE_INHERITED_CLASS_SPEC_VAR): ZEND_DECLARE_INHERITED_CLASS_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); HYBRID_BREAK(); @@ -67942,6 +67993,11 @@ void zend_init_opcodes_handlers(void) ZEND_NULL_HANDLER, ZEND_ISSET_ISEMPTY_CV_SPEC_CV_UNUSED_HANDLER, ZEND_NULL_HANDLER, + ZEND_SPECIALIZE_TRAIT_SPEC_CONST_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, + ZEND_NULL_HANDLER, ZEND_NULL_HANDLER, ZEND_ADD_LONG_NO_OVERFLOW_SPEC_CONST_TMPVARCV_HANDLER, ZEND_ADD_LONG_NO_OVERFLOW_SPEC_CONST_TMPVARCV_HANDLER, @@ -69060,7 +69116,7 @@ void zend_init_opcodes_handlers(void) 2257 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 2282 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 2307 | SPEC_RULE_OP1 | SPEC_RULE_OP2, - 4921, + 4926, 2332, 2333, 2334, @@ -69145,7 +69201,7 @@ void zend_init_opcodes_handlers(void) 3531 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3556 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3581 | SPEC_RULE_OP1 | SPEC_RULE_OP2, - 4921, + 4926, 3606 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3631 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3656 | SPEC_RULE_OP1 | SPEC_RULE_OP2, @@ -69158,7 +69214,8 @@ void zend_init_opcodes_handlers(void) 3831 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3856 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3881 | SPEC_RULE_OP1 | SPEC_RULE_OP2, - 4921 + 3906 | SPEC_RULE_OP2, + 4926 }; #if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) zend_opcode_handler_funcs = labels; @@ -69353,7 +69410,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 3906 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 3911 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69361,7 +69418,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 3931 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 3936 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69369,7 +69426,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 3956 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 3961 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69380,17 +69437,17 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 3981 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 3986 | SPEC_RULE_OP1 | SPEC_RULE_OP2; } else if (op1_info == MAY_BE_LONG && op2_info == MAY_BE_LONG) { if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4006 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4011 | SPEC_RULE_OP1 | SPEC_RULE_OP2; } else if (op1_info == MAY_BE_DOUBLE && op2_info == MAY_BE_DOUBLE) { if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4031 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4036 | SPEC_RULE_OP1 | SPEC_RULE_OP2; } break; case ZEND_MUL: @@ -69398,7 +69455,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4056 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4061 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69406,7 +69463,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4081 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4086 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69414,7 +69471,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4106 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4111 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69425,7 +69482,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4131 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4136 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69433,7 +69490,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4206 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4211 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69444,7 +69501,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4281 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4286 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69452,7 +69509,7 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4356 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4361 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69463,12 +69520,12 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4431 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4436 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; } else if (op1_info == MAY_BE_DOUBLE && op2_info == MAY_BE_DOUBLE) { if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4506 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4511 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; } break; case ZEND_IS_SMALLER_OR_EQUAL: @@ -69476,75 +69533,75 @@ ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4581 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4586 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; } else if (op1_info == MAY_BE_DOUBLE && op2_info == MAY_BE_DOUBLE) { if (op->op1_type == IS_CONST && op->op2_type == IS_CONST) { break; } - spec = 4656 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4661 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; } break; case ZEND_QM_ASSIGN: if (op1_info == MAY_BE_DOUBLE) { - spec = 4821 | SPEC_RULE_OP1; - } else if (!(op1_info & ((MAY_BE_ANY|MAY_BE_UNDEF)-(MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE)))) { spec = 4826 | SPEC_RULE_OP1; + } else if (!(op1_info & ((MAY_BE_ANY|MAY_BE_UNDEF)-(MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE)))) { + spec = 4831 | SPEC_RULE_OP1; } break; case ZEND_PRE_INC: if (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG) { - spec = 4731 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4736 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } else if (op1_info == MAY_BE_LONG) { - spec = 4741 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4746 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { - spec = 4751 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4756 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } break; case ZEND_PRE_DEC: if (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG) { - spec = 4761 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4766 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } else if (op1_info == MAY_BE_LONG) { - spec = 4771 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4776 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { - spec = 4781 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4786 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } break; case ZEND_POST_INC: if (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG) { - spec = 4791 | SPEC_RULE_OP1; - } else if (op1_info == MAY_BE_LONG) { spec = 4796 | SPEC_RULE_OP1; - } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { + } else if (op1_info == MAY_BE_LONG) { spec = 4801 | SPEC_RULE_OP1; + } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { + spec = 4806 | SPEC_RULE_OP1; } break; case ZEND_POST_DEC: if (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG) { - spec = 4806 | SPEC_RULE_OP1; - } else if (op1_info == MAY_BE_LONG) { spec = 4811 | SPEC_RULE_OP1; - } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { + } else if (op1_info == MAY_BE_LONG) { spec = 4816 | SPEC_RULE_OP1; + } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { + spec = 4821 | SPEC_RULE_OP1; } break; case ZEND_SEND_VAR_EX: if ((op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) == 0) { - spec = 4861 | SPEC_RULE_OP1 | SPEC_RULE_QUICK_ARG; + spec = 4866 | SPEC_RULE_OP1 | SPEC_RULE_QUICK_ARG; } break; case ZEND_FE_FETCH_R: if (op->op2_type == IS_CV && (op1_info & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF)) == MAY_BE_ARRAY) { - spec = 4871 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_RETVAL; + spec = 4876 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_RETVAL; } break; case ZEND_FETCH_DIM_R: if (!(op2_info & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF))) { - spec = 4831 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4836 | SPEC_RULE_OP1 | SPEC_RULE_OP2; } break; case ZEND_SEND_VAR: if ((op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) == 0) { - spec = 4856 | SPEC_RULE_OP1; + spec = 4861 | SPEC_RULE_OP1; } break; default: diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c index ecfe464..ef97a67 100644 --- a/Zend/zend_vm_opcodes.c +++ b/Zend/zend_vm_opcodes.c @@ -21,7 +21,7 @@ #include <stdio.h> #include <zend.h> -static const char *zend_vm_opcodes_names[198] = { +static const char *zend_vm_opcodes_names[199] = { "ZEND_NOP", "ZEND_ADD", "ZEND_SUB", @@ -220,9 +220,10 @@ static const char *zend_vm_opcodes_names[198] = { "ZEND_FUNC_GET_ARGS", "ZEND_UNSET_CV", "ZEND_ISSET_ISEMPTY_CV", + "ZEND_SPECIALIZE_TRAIT", }; -static uint32_t zend_vm_opcodes_flags[198] = { +static uint32_t zend_vm_opcodes_flags[199] = { 0x00000000, 0x00000707, 0x00000707, @@ -421,6 +422,7 @@ static uint32_t zend_vm_opcodes_flags[198] = { 0x00000103, 0x00000101, 0x00020101, + 0x00000300, }; ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) { diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h index 3be3641..13a913a 100644 --- a/Zend/zend_vm_opcodes.h +++ b/Zend/zend_vm_opcodes.h @@ -269,7 +269,8 @@ END_EXTERN_C() #define ZEND_FUNC_GET_ARGS 195 #define ZEND_UNSET_CV 196 #define ZEND_ISSET_ISEMPTY_CV 197 +#define ZEND_SPECIALIZE_TRAIT 198 -#define ZEND_VM_LAST_OPCODE 197 +#define ZEND_VM_LAST_OPCODE 198 #endif