com php-src: don't perform check on inline properties on read, only for magic fix binary op handler add case to zend_vm_is_fetchi ng_reference
optimize zend_verify_property_type f or most common case in first branch remove usel ess undef: Zend/zend_execute.c Zend/zend_vm_def .h
Zend/zend_vm_execute.h

From: Date: Wed, 06 Apr 2016 19:02:35 +0000
Subject: com php-src: don't perform check on inline properties on read, only for magic fix binary op handler add case to zend_vm_is_fetchi ng_reference
optimize zend_verify_property_type f or most common case in first branch remove usel ess undef: Zend/zend_execute.c Zend/zend_vm_def .h
Zend/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-95573@lists.php.net to get a copy of this message
Commit: ff56cd6ba04e33a1580f88935678ba6f644d4290 Author: Joe Watkins <krakjoe@php.net> Wed, 6 Apr 2016 20:02:35 +0100 Parents: 46742861d254a5fe74b6d88dde4232e4bae4bb5c Branches: typed_ref_properties Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ff56cd6ba04e33a1580f88935678ba6f644d4290 Log: don't perform check on inline properties on read, only for magic fix binary op handler add case to zend_vm_is_fetching_reference optimize zend_verify_property_type for most common case in first branch remove useless undef Changed paths: M Zend/zend_execute.c M Zend/zend_vm_def.h M Zend/zend_vm_execute.h

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index f3d7316..e1f987e 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -180,11 +180,14 @@ ZEND_API void* zend_vm_stack_extend(size_t size) zend_bool zend_vm_is_fetching_reference(const zend_op * opline) { zend_op const *next = opline + 1; - while (next->opcode == ZEND_NOP || - next->opcode == ZEND_TICKS || - next->opcode == ZEND_EXT_NOP || - next->opcode == ZEND_EXT_STMT) - next++; + switch (next->opcode) { + case ZEND_NOP: + case ZEND_TICKS: + case ZEND_EXT_STMT: + case ZEND_FETCH_DIM_W: { + next++; + } break; + } switch (next->opcode) { case ZEND_SEND_REF: @@ -877,6 +880,10 @@ void zend_verify_property_type_error(zend_property_info *info, zend_string *name } zend_bool zend_verify_property_type(zend_property_info *info, zval *property, zend_bool strict) { + if (EXPECTED(ZEND_SAME_FAKE_TYPE(info->type, Z_TYPE_P(property)) && Z_TYPE_P(property) != IS_OBJECT)) { + return 1; + } + switch (info->type) { case IS_OBJECT: { zend_string *resolved = zend_resolve_property_type(info->type_name, info->ce); @@ -1521,15 +1528,14 @@ static zend_never_inline void zend_assign_op_overloaded_property(zval *object, z if (prop_info) { zval tmp; - ZVAL_UNDEF(&tmp); binary_op(&tmp, z, value); if (!zend_verify_property_type(prop_info, &tmp, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { zend_verify_property_type_error(prop_info, Z_STR_P(property), &tmp); OBJ_RELEASE(Z_OBJ(obj)); return; } - - ZVAL_COPY_VALUE(z, &tmp); + zval_ptr_dtor(z); + ZVAL_COPY(z, &tmp); } else { binary_op(z, z, value); } diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index e104ec6..6007619 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1850,7 +1850,7 @@ ZEND_VM_HANDLER(82, ZEND_FETCH_OBJ_R, CONST|TMP|VAR|UNUSED|THIS|CV, CONST|TMPVAR retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + ZEND_VM_C_GOTO(fetch_obj_r_exit); } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index c4a5b40..e8d9347 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -5663,7 +5663,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CONST_H retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -9537,7 +9537,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CV_HAND retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -11489,7 +11489,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_TMPVAR_ retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -14018,7 +14018,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CONST_HAN retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -15273,7 +15273,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CV_HANDLE retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -15829,7 +15829,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_TMPVAR_HA retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -18612,7 +18612,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_VAR_CONST_HAN retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -23104,7 +23104,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_VAR_CV_HANDLE retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -25781,7 +25781,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_VAR_TMPVAR_HA retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -28256,7 +28256,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_CONST_ retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -31702,7 +31702,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_CV_HAN retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -34080,7 +34080,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_TMPVAR retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -39056,7 +39056,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_CONST_HAND retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -45604,7 +45604,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_CV_HANDLER retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset)); @@ -49366,7 +49366,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_TMPVAR_HAN retval = OBJ_PROP(zobj, prop_offset); if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) { ZVAL_COPY(EX_VAR(opline->result.var), retval); - break; + goto fetch_obj_r_exit; } } else if (EXPECTED(zobj->properties != NULL)) { retval = zend_hash_find(zobj->properties, Z_STR_P(offset));
« previous php.cvs (#95573) next »