com php-src: Reverted incomplete fix: Zend/zend_object_hand lers.c Zend/zend_vm_def.h Zend/zend_vm_execute .h
| From: | Bob Weinand | Date: | Wed, 25 May 2016 07:45:30 +0000 |
| Subject: | com php-src: Reverted incomplete fix: Zend/zend_object_hand lers.c Zend/zend_vm_def.h Zend/zend_vm_execute .h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95520@lists.php.net to get a copy of this message | ||
Commit: 03861bd484738d43567466cb9ef20185e20dd2c8
Author: Dmitry Stogov <dmitry@zend.com> Wed, 25 May 2016 10:45:30 +0300
Parents: 142e1dad41a7a1539f786fe3c54133ff69668d2b
Branches: typed_ref_properties
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=03861bd484738d43567466cb9ef20185e20dd2c8
Log:
Reverted incomplete fix
Changed paths:
M Zend/zend_object_handlers.c
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index ec3dac0..2b4aa94 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -591,7 +591,7 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ zval tmp_member; zval *retval; uint32_t property_offset; - zend_property_info *prop_info = NULL; + zend_property_info *prop_info; zobj = Z_OBJ_P(object); @@ -734,25 +734,12 @@ ZEND_API void zend_std_write_property(zval *object, zval *member, zval *value, v variable_ptr = OBJ_PROP(zobj, property_offset); if (Z_TYPE_P(variable_ptr) != IS_UNDEF) { zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot); - zval val; if (UNEXPECTED(prop_info)) { - ZVAL_COPY(&val, value); - if (!zend_verify_property_type(prop_info, &val, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { - zend_verify_property_type_error(prop_info, Z_STR_P(member), &val); + if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { + zend_verify_property_type_error(prop_info, Z_STR_P(member), value); goto exit; } - if (UNEXPECTED(Z_TYPE(val) != Z_TYPE_P(value))) { - /* little hack to avoid checking prop_info or inlining zend_assign_to_variable multiple times */ - if (UNEXPECTED(Z_REFCOUNTED(tmp_member))) { - zval_ptr_dtor(&tmp_member); - } - - ZVAL_COPY_VALUE(&tmp_member, &val); - value = &val; - } else if (Z_OPT_REFCOUNTED_P(value)) { - Z_DELREF_P(value); - } } found: zend_assign_to_variable(variable_ptr, value, IS_CV); @@ -808,13 +795,10 @@ write_std_property: Z_ADDREF_P(value); } } - if (EXPECTED(property_offset != ZEND_DYNAMIC_PROPERTY_OFFSET)) { zend_property_info *prop_info; - zval val; + if (cache_slot ? UNEXPECTED(prop_info = (zend_property_info *) CACHED_PTR_EX(cache_slot + 2)) : UNEXPECTED(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), NULL))) { - ZVAL_COPY_VALUE(&val, value); - value = &val; if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { zend_verify_property_type_error(prop_info, Z_STR_P(member), value); zval_ptr_dtor(value); diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 8ce50e2..66f546d 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2245,28 +2245,15 @@ ZEND_VM_HANDLER(136, ZEND_ASSIGN_OBJ, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV, SPEC( zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (OP_DATA_TYPE & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (OP_DATA_TYPE & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } FREE_OP_DATA(); FREE_OP2(); FREE_OP1_VAR_PTR(); HANDLE_EXCEPTION(); } - if (OP_DATA_TYPE & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (OP_DATA_TYPE == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (OP_DATA_TYPE == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 2548846..efc5504 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -18463,28 +18463,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -18664,28 +18651,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -18865,28 +18839,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -19066,28 +19027,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -23619,28 +23567,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -23820,28 +23755,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -24021,28 +23943,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -24222,28 +24131,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -26882,28 +26778,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -27083,28 +26966,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -27284,28 +27154,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -27485,28 +27342,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -29774,28 +29618,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -29975,28 +29806,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -30176,28 +29994,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -30377,28 +30182,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -33571,28 +33363,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -33772,28 +33551,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -33973,28 +33739,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -34174,28 +33927,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -36259,28 +35999,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -36460,28 +36187,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -36661,28 +36375,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -36862,28 +36563,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -41766,28 +41454,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -41967,28 +41642,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -42168,28 +41830,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -42369,28 +42018,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -48969,28 +48605,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -49170,28 +48793,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -49371,28 +48981,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -49572,28 +49169,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -53306,28 +52890,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -53507,28 +53078,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -53708,28 +53266,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -53909,28 +53454,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } }
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index ec3dac0..2b4aa94 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -591,7 +591,7 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ zval tmp_member; zval *retval; uint32_t property_offset; - zend_property_info *prop_info = NULL; + zend_property_info *prop_info; zobj = Z_OBJ_P(object); @@ -734,25 +734,12 @@ ZEND_API void zend_std_write_property(zval *object, zval *member, zval *value, v variable_ptr = OBJ_PROP(zobj, property_offset); if (Z_TYPE_P(variable_ptr) != IS_UNDEF) { zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot); - zval val; if (UNEXPECTED(prop_info)) { - ZVAL_COPY(&val, value); - if (!zend_verify_property_type(prop_info, &val, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { - zend_verify_property_type_error(prop_info, Z_STR_P(member), &val); + if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { + zend_verify_property_type_error(prop_info, Z_STR_P(member), value); goto exit; } - if (UNEXPECTED(Z_TYPE(val) != Z_TYPE_P(value))) { - /* little hack to avoid checking prop_info or inlining zend_assign_to_variable multiple times */ - if (UNEXPECTED(Z_REFCOUNTED(tmp_member))) { - zval_ptr_dtor(&tmp_member); - } - - ZVAL_COPY_VALUE(&tmp_member, &val); - value = &val; - } else if (Z_OPT_REFCOUNTED_P(value)) { - Z_DELREF_P(value); - } } found: zend_assign_to_variable(variable_ptr, value, IS_CV); @@ -808,13 +795,10 @@ write_std_property: Z_ADDREF_P(value); } } - if (EXPECTED(property_offset != ZEND_DYNAMIC_PROPERTY_OFFSET)) { zend_property_info *prop_info; - zval val; + if (cache_slot ? UNEXPECTED(prop_info = (zend_property_info *) CACHED_PTR_EX(cache_slot + 2)) : UNEXPECTED(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), NULL))) { - ZVAL_COPY_VALUE(&val, value); - value = &val; if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { zend_verify_property_type_error(prop_info, Z_STR_P(member), value); zval_ptr_dtor(value); diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 8ce50e2..66f546d 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2245,28 +2245,15 @@ ZEND_VM_HANDLER(136, ZEND_ASSIGN_OBJ, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV, SPEC( zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (OP_DATA_TYPE & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (OP_DATA_TYPE & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } FREE_OP_DATA(); FREE_OP2(); FREE_OP1_VAR_PTR(); HANDLE_EXCEPTION(); } - if (OP_DATA_TYPE & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (OP_DATA_TYPE == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (OP_DATA_TYPE == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 2548846..efc5504 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -18463,28 +18463,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -18664,28 +18651,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -18865,28 +18839,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -19066,28 +19027,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -23619,28 +23567,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -23820,28 +23755,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -24021,28 +23943,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -24222,28 +24131,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_CV_OP_DATA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -26882,28 +26778,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -27083,28 +26966,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -27284,28 +27154,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -27485,28 +27342,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_VAR_TMPVAR_OP_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -29774,28 +29618,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -29975,28 +29806,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -30176,28 +29994,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -30377,28 +30182,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_O zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -33571,28 +33363,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -33772,28 +33551,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -33973,28 +33739,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -34174,28 +33927,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -36259,28 +35999,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -36460,28 +36187,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -36661,28 +36375,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -36862,28 +36563,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMPVAR_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -41766,28 +41454,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -41967,28 +41642,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -42168,28 +41830,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -42369,28 +42018,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CONST_OP_DA zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -48969,28 +48605,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -49170,28 +48793,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -49371,28 +48981,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -49572,28 +49169,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_CV_OP_DATA_ zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -53306,28 +52890,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CONST & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_CONST & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CONST == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -53507,28 +53078,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_TMP_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_TMP_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -53708,28 +53266,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_VAR & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op_data); zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_VAR & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_VAR == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } @@ -53909,28 +53454,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_OP_D zend_property_info *prop_info = (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); if (UNEXPECTED(prop_info != NULL)) { - zval val, *orig; - /* avoid overwriting source (does not matter for TMP/VAR) */ - if (IS_CV & (IS_CONST | IS_CV)) { - orig = value; - ZVAL_COPY(&val, value); - value = &val; - } if (UNEXPECTED(!i_zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES()))) { zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - if (IS_CV & (IS_CONST | IS_CV)) { - zval_ptr_dtor_nogc(&val); - } /* will remain valid, thus no need to check prop_info in future here */ - if (IS_CV == IS_CONST && Z_TYPE(val) == Z_TYPE_P(orig)) { + if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } }