com php-src: Begin specialization: Zend/zend.h Zend/zend_comp ile.c Zend/zend_inheritance.c Zend/zend_inheritance .h Zend/zend_vm_def.h
Zend/zend_vm_execute.h Zend/zend_vm_opcodes.c Zend/zend_vm_opcodes.h

From: Date: Thu, 16 Nov 2017 06:16:36 +0000
Subject: com php-src: Begin specialization: Zend/zend.h Zend/zend_comp ile.c Zend/zend_inheritance.c Zend/zend_inheritance .h 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-100304@lists.php.net to get a copy of this message
Commit: 887155c38b2d1866a590d86e5164d45af62bf0d9 Author: Levi Morrison <levim@php.net> Wed, 15 Nov 2017 23:16:36 -0700 Parents: 09a10ff949418afc9099013000ed1d5e1cdbb642 Branches: levi/generic_traits Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=887155c38b2d1866a590d86e5164d45af62bf0d9 Log: Begin specialization Changed paths: M Zend/zend.h M Zend/zend_compile.c M Zend/zend_inheritance.c M Zend/zend_inheritance.h 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 5fc1980..ad11324 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -159,9 +159,7 @@ struct _zend_class_entry { union { zend_class_entry **interfaces; - - /* trait definitons hold the names here */ - zend_string **type_parameters; + HashTable * type_parameters; }; zend_class_entry **traits; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2160070..8f5dc60 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4151,8 +4151,10 @@ void zend_compile_new(znode *result, zend_ast *ast) /* {{{ */ zend_ast *class_ast = ast->child[0]; zend_ast *args_ast = ast->child[1]; - znode class_node, ctor_result; + znode class_node, ctor_result, type_parameter_node; zend_op *opline; + zend_class_entry * ce = CG(active_class_entry); + zend_bool is_type_parameter = 0; uint32_t opnum; if (class_ast->kind == ZEND_AST_CLASS) { @@ -4170,15 +4172,35 @@ void zend_compile_new(znode *result, zend_ast *ast) /* {{{ */ zend_compile_class_ref_ex(&class_node, class_ast, ZEND_FETCH_CLASS_EXCEPTION); } - opnum = get_next_op_number(CG(active_op_array)); - opline = zend_emit_op(result, ZEND_NEW, NULL, NULL); + if (class_node.op_type == IS_CONST && ce && (ce->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT && ce->num_interfaces > 0) { + zval * type_parameter; + ZEND_HASH_FOREACH_VAL(ce->type_parameters, type_parameter) { + zend_string * new_type = Z_STR(class_node.u.constant); + if (zend_string_equals_ci(new_type, Z_STR_P(type_parameter))) { + is_type_parameter = 1; + opline = zend_emit_op(&type_parameter_node, ZEND_FETCH_TYPE_PARAMETER, &FC(implementing_class), NULL); +/* + opline->op2_type = IS_CONST; + opline->op2.constant = zend_add_class_name_literal( + CG(active_op_array), Z_STR(class_node.u.constant)); +*/ + } + } ZEND_HASH_FOREACH_END(); + } - if (class_node.op_type == IS_CONST) { - opline->op1_type = IS_CONST; - opline->op1.constant = zend_add_class_name_literal( - CG(active_op_array), Z_STR(class_node.u.constant)); + opnum = get_next_op_number(CG(active_op_array)); + if (0 && is_type_parameter) { + opline = zend_emit_op(result, ZEND_NEW, &type_parameter_node, NULL); } else { - SET_NODE(opline->op1, &class_node); + opline = zend_emit_op(result, ZEND_NEW, NULL, NULL); + + if (class_node.op_type == IS_CONST) { + opline->op1_type = IS_CONST; + opline->op1.constant = zend_add_class_name_literal( + CG(active_op_array), Z_STR(class_node.u.constant)); + } else { + SET_NODE(opline->op1, &class_node); + } } zend_compile_call_common(&ctor_result, args_ast, NULL); @@ -6231,16 +6253,16 @@ HashTable * zend_compile_type_parameters(zend_ast *ast) /* {{{ */ { HashTable *result; zend_ast_list *list = zend_ast_get_list(ast); - uint32_t i; + zend_ulong 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); + zend_string * key = zend_ast_get_str(elem_ast); zval tmp; - ZVAL_STR(&tmp, value); + ZVAL_STR_COPY(&tmp, key); zend_hash_index_update(result, i, &tmp); } return result; @@ -6338,21 +6360,28 @@ void zend_compile_implements(znode *class_node, zend_ast *ast) /* {{{ */ } /* }}} */ -void zend_compile_type_arguments(znode *class_node, zend_ast *ast) /* {{{ */ +void zend_compile_type_arguments(zend_class_entry * ce, zend_ast *ast) /* {{{ */ { zend_ast_list *list = zend_ast_get_list(ast); - uint32_t i; + zend_ulong i; + + if (list->children > 0) { + ce->type_parameters = zend_new_array(list->children); + } for (i = 0; i < list->children; ++i) { zend_ast *class_ast = list->child[i]; zend_string *name = zend_ast_get_str(class_ast); + zval tmp; + 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 + ZVAL_STR_COPY(&tmp, name); + zend_hash_index_update(ce->type_parameters, i, &tmp); - CG(active_class_entry)->num_interfaces++; + ce->num_interfaces++; } } /* }}} */ @@ -6489,6 +6518,10 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */ CG(active_class_entry) = ce; + if (is_trait) { + zend_compile_type_arguments(ce, implements_ast); + } + zend_compile_stmt(stmt_ast); /* Reset lineno for final opcodes and errors */ @@ -6544,9 +6577,7 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */ zend_emit_op(NULL, ZEND_BIND_TRAITS, &declare_node, NULL); } - if (is_trait) { - zend_compile_type_arguments(&declare_node, implements_ast); - } else if (implements_ast) { + if (implements_ast && !is_trait) { zend_compile_implements(&declare_node, implements_ast); } diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index b9794b0..5be066e 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1749,6 +1749,39 @@ void zend_check_deprecated_constructor(const zend_class_entry *ce) /* {{{ */ } /* }}} */ +ZEND_API zend_class_entry * zend_specialize_trait(zend_class_entry *trait, HashTable * type_parameters) /* {{{ */ +{ + // todo: find proper arena? + zend_class_entry * specialized_ce; + + 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 + ); + } + + specialized_ce = (zend_class_entry *) emalloc(sizeof(zend_class_entry)); + + // todo: figure out the proper way to duplicate the members + memcpy(specialized_ce, trait, sizeof(zend_class_entry)); + + specialized_ce->type_parameters = zend_new_array(zend_hash_num_elements(type_parameters)); + + { + zend_ulong hash; + zval * key; + ZEND_HASH_FOREACH_NUM_KEY_VAL(trait->type_parameters, hash, key) { + zval * value = zend_hash_index_find(type_parameters, hash); + zend_hash_update(specialized_ce->type_parameters, Z_STR_P(key), value); + } ZEND_HASH_FOREACH_END(); + } + + return specialized_ce; +} +/* }}} */ + /* * Local variables: * tab-width: 4 diff --git a/Zend/zend_inheritance.h b/Zend/zend_inheritance.h index 653734b..13b44c3 100644 --- a/Zend/zend_inheritance.h +++ b/Zend/zend_inheritance.h @@ -29,6 +29,7 @@ ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry ZEND_API void zend_do_implement_trait(zend_class_entry *ce, zend_class_entry *trait); ZEND_API void zend_do_bind_traits(zend_class_entry *ce); +ZEND_API zend_class_entry * zend_specialize_trait(zend_class_entry *ce, HashTable * type_parameters); ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce); void zend_do_early_binding(void); diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 0246d2d..e2da7d1 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -6962,7 +6962,7 @@ 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, *specialized_trait; + zend_class_entry *trait; HashTable * type_parameters; SAVE_OPLINE(); @@ -6982,17 +6982,8 @@ ZEND_VM_HANDLER(198, ZEND_SPECIALIZE_TRAIT, ANY, CONST) } 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; + Z_CE_P(EX_VAR(opline->result.var)) = zend_specialize_trait(trait, type_parameters); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -8383,6 +8374,18 @@ ZEND_VM_HANDLER(195, ZEND_FUNC_GET_ARGS, UNUSED|CONST, UNUSED) ZEND_VM_NEXT_OPCODE(); } +ZEND_VM_HANDLER(199, ZEND_FETCH_TYPE_PARAMETER, ANY, ANY) +{ + USE_OPLINE + zend_class_entry *trait = Z_CE_P(EX_VAR(opline->op1.var)); + + SAVE_OPLINE(); + + Z_CE_P(EX_VAR(opline->result.var)) = trait; + + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); +} + ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_ADD, (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG && op2_info == MAY_BE_LONG), ZEND_ADD_LONG_NO_OVERFLOW, CONST|TMPVARCV, CONST|TMPVARCV, SPEC(NO_CONST_CONST,COMMUTATIVE)) { USE_OPLINE diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 9fe6f9d..3a975bf 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2083,6 +2083,18 @@ call_trampoline_end: ZEND_VM_LEAVE(); } +static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_TYPE_PARAMETER_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + USE_OPLINE + zend_class_entry *trait = Z_CE_P(EX_VAR(opline->op1.var)); + + SAVE_OPLINE(); + + Z_CE_P(EX_VAR(opline->result.var)) = trait; + + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); +} + static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS) { EG(vm_interrupt) = 0; @@ -2355,7 +2367,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SPECIALIZE_TRAIT_SPEC_CONST_HA { USE_OPLINE zend_class_entry *ce = Z_CE_P(EX_VAR(opline->op1.var)); - zend_class_entry *trait, *specialized_trait; + zend_class_entry *trait; HashTable * type_parameters; SAVE_OPLINE(); @@ -2382,10 +2394,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SPECIALIZE_TRAIT_SPEC_CONST_HA trait->num_interfaces ); } - // todo: actually specialize - specialized_trait = trait; - Z_CE_P(EX_VAR(opline->result.var)) = specialized_trait; + Z_CE_P(EX_VAR(opline->result.var)) = zend_specialize_trait(trait, type_parameters); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -59000,6 +59010,7 @@ ZEND_API void execute_ex(zend_execute_data *ex) (void*)&&ZEND_NULL_LABEL, (void*)&&ZEND_NULL_LABEL, (void*)&&ZEND_NULL_LABEL, + (void*)&&ZEND_FETCH_TYPE_PARAMETER_SPEC_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, @@ -60148,6 +60159,9 @@ ZEND_API void execute_ex(zend_execute_data *ex) HYBRID_CASE(ZEND_CALL_TRAMPOLINE_SPEC): ZEND_CALL_TRAMPOLINE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); HYBRID_BREAK(); + HYBRID_CASE(ZEND_FETCH_TYPE_PARAMETER_SPEC): + ZEND_FETCH_TYPE_PARAMETER_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + HYBRID_BREAK(); HYBRID_CASE(ZEND_FETCH_CLASS_SPEC_CONST): ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); HYBRID_BREAK(); @@ -67998,6 +68012,7 @@ void zend_init_opcodes_handlers(void) ZEND_NULL_HANDLER, ZEND_NULL_HANDLER, ZEND_NULL_HANDLER, + ZEND_FETCH_TYPE_PARAMETER_SPEC_HANDLER, ZEND_NULL_HANDLER, ZEND_ADD_LONG_NO_OVERFLOW_SPEC_CONST_TMPVARCV_HANDLER, ZEND_ADD_LONG_NO_OVERFLOW_SPEC_CONST_TMPVARCV_HANDLER, @@ -69116,7 +69131,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, - 4926, + 4927, 2332, 2333, 2334, @@ -69201,7 +69216,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, - 4926, + 4927, 3606 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3631 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3656 | SPEC_RULE_OP1 | SPEC_RULE_OP2, @@ -69215,7 +69230,8 @@ void zend_init_opcodes_handlers(void) 3856 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3881 | SPEC_RULE_OP1 | SPEC_RULE_OP2, 3906 | SPEC_RULE_OP2, - 4926 + 3911, + 4927 }; #if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) zend_opcode_handler_funcs = labels; @@ -69410,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 = 3911 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 3912 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69418,7 +69434,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 = 3936 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 3937 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69426,7 +69442,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 = 3961 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 3962 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69437,17 +69453,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 = 3986 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 3987 | 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 = 4011 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4012 | 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 = 4036 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4037 | SPEC_RULE_OP1 | SPEC_RULE_OP2; } break; case ZEND_MUL: @@ -69455,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 = 4061 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4062 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69463,7 +69479,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 = 4086 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4087 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69471,7 +69487,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 = 4111 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4112 | SPEC_RULE_OP1 | SPEC_RULE_OP2; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69482,7 +69498,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 = 4136 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4137 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69490,7 +69506,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 = 4211 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4212 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69501,7 +69517,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 = 4286 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4287 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69509,7 +69525,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 = 4361 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4362 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; if (op->op1_type > op->op2_type) { zend_swap_operands(op); } @@ -69520,12 +69536,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 = 4436 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4437 | 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 = 4511 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4512 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; } break; case ZEND_IS_SMALLER_OR_EQUAL: @@ -69533,75 +69549,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 = 4586 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4587 | 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 = 4661 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; + spec = 4662 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_SMART_BRANCH; } break; case ZEND_QM_ASSIGN: if (op1_info == MAY_BE_DOUBLE) { - spec = 4826 | SPEC_RULE_OP1; + spec = 4827 | 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; + spec = 4832 | SPEC_RULE_OP1; } break; case ZEND_PRE_INC: if (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG) { - spec = 4736 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4737 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } else if (op1_info == MAY_BE_LONG) { - spec = 4746 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4747 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { - spec = 4756 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4757 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } break; case ZEND_PRE_DEC: if (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG) { - spec = 4766 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4767 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } else if (op1_info == MAY_BE_LONG) { - spec = 4776 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4777 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { - spec = 4786 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; + spec = 4787 | SPEC_RULE_OP1 | SPEC_RULE_RETVAL; } break; case ZEND_POST_INC: if (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG) { - spec = 4796 | SPEC_RULE_OP1; + spec = 4797 | SPEC_RULE_OP1; } else if (op1_info == MAY_BE_LONG) { - spec = 4801 | SPEC_RULE_OP1; + spec = 4802 | SPEC_RULE_OP1; } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { - spec = 4806 | SPEC_RULE_OP1; + spec = 4807 | SPEC_RULE_OP1; } break; case ZEND_POST_DEC: if (res_info == MAY_BE_LONG && op1_info == MAY_BE_LONG) { - spec = 4811 | SPEC_RULE_OP1; + spec = 4812 | SPEC_RULE_OP1; } else if (op1_info == MAY_BE_LONG) { - spec = 4816 | SPEC_RULE_OP1; + spec = 4817 | SPEC_RULE_OP1; } else if (op1_info == (MAY_BE_LONG|MAY_BE_DOUBLE)) { - spec = 4821 | SPEC_RULE_OP1; + spec = 4822 | SPEC_RULE_OP1; } break; case ZEND_SEND_VAR_EX: if ((op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) == 0) { - spec = 4866 | SPEC_RULE_OP1 | SPEC_RULE_QUICK_ARG; + spec = 4867 | 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 = 4876 | SPEC_RULE_OP1 | SPEC_RULE_OP2 | SPEC_RULE_RETVAL; + spec = 4877 | 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 = 4836 | SPEC_RULE_OP1 | SPEC_RULE_OP2; + spec = 4837 | SPEC_RULE_OP1 | SPEC_RULE_OP2; } break; case ZEND_SEND_VAR: if ((op1_info & (MAY_BE_UNDEF|MAY_BE_REF)) == 0) { - spec = 4861 | SPEC_RULE_OP1; + spec = 4862 | SPEC_RULE_OP1; } break; default: diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c index ef97a67..586c441 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[199] = { +static const char *zend_vm_opcodes_names[200] = { "ZEND_NOP", "ZEND_ADD", "ZEND_SUB", @@ -221,9 +221,10 @@ static const char *zend_vm_opcodes_names[199] = { "ZEND_UNSET_CV", "ZEND_ISSET_ISEMPTY_CV", "ZEND_SPECIALIZE_TRAIT", + "ZEND_FETCH_TYPE_PARAMETER", }; -static uint32_t zend_vm_opcodes_flags[199] = { +static uint32_t zend_vm_opcodes_flags[200] = { 0x00000000, 0x00000707, 0x00000707, @@ -423,6 +424,7 @@ static uint32_t zend_vm_opcodes_flags[199] = { 0x00000101, 0x00020101, 0x00000300, + 0x00000000, }; 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 13a913a..39c5f24 100644 --- a/Zend/zend_vm_opcodes.h +++ b/Zend/zend_vm_opcodes.h @@ -270,7 +270,8 @@ END_EXTERN_C() #define ZEND_UNSET_CV 196 #define ZEND_ISSET_ISEMPTY_CV 197 #define ZEND_SPECIALIZE_TRAIT 198 +#define ZEND_FETCH_TYPE_PARAMETER 199 -#define ZEND_VM_LAST_OPCODE 198 +#define ZEND_VM_LAST_OPCODE 199 #endif
« previous php.cvs (#100304) next »