com php-src: Faster +=/++/--: Zend/tests/type_declarati ons/typed_properties_057.phpt Zend/zend_vm_de f.h Zend/zend_vm_execute.h

From: Date: Thu, 26 May 2016 10:54:12 +0000
Subject: com php-src: Faster +=/++/--: Zend/tests/type_declarati ons/typed_properties_057.phpt Zend/zend_vm_de f.h Zend/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-95519@lists.php.net to get a copy of this message
Commit: 8bc20782cc522f11089046f33464770d448a2c95 Author: Dmitry Stogov <dmitry@zend.com> Thu, 26 May 2016 13:54:12 +0300 Parents: b2cebf66275bf3ad5a98934a4b061a84c9448d3b Branches: typed_ref_properties Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8bc20782cc522f11089046f33464770d448a2c95 Log: Faster +=/++/-- Changed paths: M Zend/tests/type_declarations/typed_properties_057.phpt M Zend/zend_vm_def.h M Zend/zend_vm_execute.h

diff --git a/Zend/tests/type_declarations/typed_properties_057.phpt b/Zend/tests/type_declarations/typed_properties_057.phpt index 4b98dd1..fefe8d0 100644 --- a/Zend/tests/type_declarations/typed_properties_057.phpt +++ b/Zend/tests/type_declarations/typed_properties_057.phpt @@ -1,5 +1,5 @@ --TEST-- -Type change in pre-increment (use-after-free) +Type change in pre/post-increment (use-after-free) --FILE-- <?php declare(strict_types=1); @@ -16,8 +16,16 @@ try { echo $e->getMessage() . "\n"; } var_dump($o->foo); +try { + $x = $o->foo++; +} catch (Throwable $e) { + echo $e->getMessage() . "\n"; +} +var_dump($o->foo); unset($o); ?> --EXPECT-- Typed property A::$foo must be string, integer used string(3) "100" +Typed property A::$foo must be string, integer used +string(3) "100" diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 182d1ba..d7fc6f6 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -707,6 +707,8 @@ ZEND_VM_HELPER(zend_binary_assign_op_obj_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, zval *property; zval *value; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_RW); @@ -735,9 +737,9 @@ ZEND_VM_HELPER(zend_binary_assign_op_obj_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, } /* here we are sure we are dealing with an object */ + cache_slot = (OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -746,13 +748,37 @@ ZEND_VM_HELPER(zend_binary_assign_op_obj_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, ZVAL_DEREF(zptr); SEPARATE_ZVAL_NOREF(zptr); - binary_op(zptr, zptr, value); - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (OP2_TYPE == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + binary_op(&z_copy, &z_copy, value); + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + binary_op(zptr, zptr, value); + } + + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_assign_op_overloaded_property(object, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_assign_op_overloaded_property(object, property, cache_slot, value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -1145,6 +1171,8 @@ ZEND_VM_HELPER(zend_pre_incdec_property_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_RW); @@ -1170,9 +1198,9 @@ ZEND_VM_HELPER(zend_pre_incdec_property_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, } /* here we are sure we are dealing with an object */ + cache_slot = (OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -1184,22 +1212,71 @@ ZEND_VM_HELPER(zend_pre_incdec_property_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (OP2_TYPE == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); - SEPARATE_ZVAL_NOREF(zptr); - - if (inc) { - increment_function(zptr); + + if (OP2_TYPE == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } } else { - decrement_function(zptr); + SEPARATE_ZVAL_NOREF(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_pre_incdec_overloaded_property(object, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_pre_incdec_overloaded_property(object, property, cache_slot, inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -1225,6 +1302,8 @@ ZEND_VM_HELPER(zend_post_incdec_property_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_RW); @@ -1248,10 +1327,9 @@ ZEND_VM_HELPER(zend_post_incdec_property_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, } /* here we are sure we are dealing with an object */ - + cache_slot = (OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { ZVAL_NULL(EX_VAR(opline->result.var)); } else { @@ -1262,19 +1340,68 @@ ZEND_VM_HELPER(zend_post_incdec_property_helper, VAR|UNUSED|CV, CONST|TMPVAR|CV, } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (OP2_TYPE == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr); - zval_opt_copy_ctor(zptr); - if (inc) { - increment_function(zptr); + + if (OP2_TYPE == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); } else { - decrement_function(zptr); + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + ZVAL_COPY_VALUE(zptr, val); + } + } else { + zval_opt_copy_ctor(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } } } else { - zend_post_incdec_overloaded_property(object, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, EX_VAR(opline->result.var)); + zend_post_incdec_overloaded_property(object, property, cache_slot, inc, EX_VAR(opline->result.var)); } } while (0); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index f8d9545..e7b5177 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -16961,6 +16961,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP zval *property; zval *value; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -16989,9 +16991,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP } /* here we are sure we are dealing with an object */ + cache_slot = (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -17000,13 +17002,37 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP ZVAL_DEREF(zptr); SEPARATE_ZVAL_NOREF(zptr); - binary_op(zptr, zptr, value); - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + binary_op(&z_copy, &z_copy, value); + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + binary_op(zptr, zptr, value); + } + + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_assign_op_overloaded_property(object, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_assign_op_overloaded_property(object, property, cache_slot, value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -17877,6 +17903,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -17902,9 +17930,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } /* here we are sure we are dealing with an object */ + cache_slot = (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -17916,22 +17944,71 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); - SEPARATE_ZVAL_NOREF(zptr); - if (inc) { - increment_function(zptr); + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); } else { - decrement_function(zptr); + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + SEPARATE_ZVAL_NOREF(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_pre_incdec_overloaded_property(object, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_pre_incdec_overloaded_property(object, property, cache_slot, inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -17956,6 +18033,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -17979,10 +18058,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } /* here we are sure we are dealing with an object */ - + cache_slot = (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { ZVAL_NULL(EX_VAR(opline->result.var)); } else { @@ -17993,19 +18071,68 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr); - zval_opt_copy_ctor(zptr); - if (inc) { - increment_function(zptr); + + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + ZVAL_COPY_VALUE(zptr, val); + } } else { - decrement_function(zptr); + zval_opt_copy_ctor(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } } } else { - zend_post_incdec_overloaded_property(object, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, EX_VAR(opline->result.var)); + zend_post_incdec_overloaded_property(object, property, cache_slot, inc, EX_VAR(opline->result.var)); } } while (0); @@ -22058,6 +22185,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP zval *property; zval *value; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -22086,9 +22215,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP } /* here we are sure we are dealing with an object */ + cache_slot = (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -22097,13 +22226,37 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP ZVAL_DEREF(zptr); SEPARATE_ZVAL_NOREF(zptr); - binary_op(zptr, zptr, value); - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + binary_op(&z_copy, &z_copy, value); + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + binary_op(zptr, zptr, value); + } + + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_assign_op_overloaded_property(object, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_assign_op_overloaded_property(object, property, cache_slot, value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -22974,6 +23127,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -22999,9 +23154,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } /* here we are sure we are dealing with an object */ + cache_slot = (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -23013,22 +23168,71 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); - SEPARATE_ZVAL_NOREF(zptr); - if (inc) { - increment_function(zptr); + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); } else { - decrement_function(zptr); + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + SEPARATE_ZVAL_NOREF(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_pre_incdec_overloaded_property(object, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_pre_incdec_overloaded_property(object, property, cache_slot, inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -23053,6 +23257,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -23076,10 +23282,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } /* here we are sure we are dealing with an object */ - + cache_slot = (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { ZVAL_NULL(EX_VAR(opline->result.var)); } else { @@ -23090,19 +23295,68 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr); - zval_opt_copy_ctor(zptr); - if (inc) { - increment_function(zptr); + + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + ZVAL_COPY_VALUE(zptr, val); + } } else { - decrement_function(zptr); + zval_opt_copy_ctor(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } } } else { - zend_post_incdec_overloaded_property(object, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, EX_VAR(opline->result.var)); + zend_post_incdec_overloaded_property(object, property, cache_slot, inc, EX_VAR(opline->result.var)); } } while (0); @@ -25254,6 +25508,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP zval *property; zval *value; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -25282,9 +25538,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP } /* here we are sure we are dealing with an object */ + cache_slot = ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -25293,13 +25549,37 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP ZVAL_DEREF(zptr); SEPARATE_ZVAL_NOREF(zptr); - binary_op(zptr, zptr, value); - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + binary_op(&z_copy, &z_copy, value); + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + binary_op(zptr, zptr, value); + } + + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_assign_op_overloaded_property(object, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_assign_op_overloaded_property(object, property, cache_slot, value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -26172,6 +26452,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -26197,9 +26479,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } /* here we are sure we are dealing with an object */ + cache_slot = ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -26211,22 +26493,71 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); - SEPARATE_ZVAL_NOREF(zptr); - if (inc) { - increment_function(zptr); + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); } else { - decrement_function(zptr); + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + SEPARATE_ZVAL_NOREF(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_pre_incdec_overloaded_property(object, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_pre_incdec_overloaded_property(object, property, cache_slot, inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -26252,6 +26583,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -26275,10 +26608,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } /* here we are sure we are dealing with an object */ - + cache_slot = ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { ZVAL_NULL(EX_VAR(opline->result.var)); } else { @@ -26289,19 +26621,68 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr); - zval_opt_copy_ctor(zptr); - if (inc) { - increment_function(zptr); + + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); } else { - decrement_function(zptr); + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + ZVAL_COPY_VALUE(zptr, val); + } + } else { + zval_opt_copy_ctor(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } } } else { - zend_post_incdec_overloaded_property(object, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, EX_VAR(opline->result.var)); + zend_post_incdec_overloaded_property(object, property, cache_slot, inc, EX_VAR(opline->result.var)); } } while (0); @@ -28381,6 +28762,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP zval *property; zval *value; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_obj_zval_ptr_unused(execute_data); @@ -28409,9 +28792,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP } /* here we are sure we are dealing with an object */ + cache_slot = (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -28420,13 +28803,37 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP ZVAL_DEREF(zptr); SEPARATE_ZVAL_NOREF(zptr); - binary_op(zptr, zptr, value); - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + binary_op(&z_copy, &z_copy, value); + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + binary_op(zptr, zptr, value); + } + + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_assign_op_overloaded_property(object, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_assign_op_overloaded_property(object, property, cache_slot, value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -29027,6 +29434,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_obj_zval_ptr_unused(execute_data); @@ -29052,9 +29461,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } /* here we are sure we are dealing with an object */ + cache_slot = (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -29066,22 +29475,71 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); - SEPARATE_ZVAL_NOREF(zptr); - if (inc) { - increment_function(zptr); + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } } else { - decrement_function(zptr); + SEPARATE_ZVAL_NOREF(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_pre_incdec_overloaded_property(object, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_pre_incdec_overloaded_property(object, property, cache_slot, inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -29106,6 +29564,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_obj_zval_ptr_unused(execute_data); @@ -29129,10 +29589,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } /* here we are sure we are dealing with an object */ - + cache_slot = (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { ZVAL_NULL(EX_VAR(opline->result.var)); } else { @@ -29143,19 +29602,68 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr); - zval_opt_copy_ctor(zptr); - if (inc) { - increment_function(zptr); + + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + ZVAL_COPY_VALUE(zptr, val); + } } else { - decrement_function(zptr); + zval_opt_copy_ctor(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } } } else { - zend_post_incdec_overloaded_property(object, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, EX_VAR(opline->result.var)); + zend_post_incdec_overloaded_property(object, property, cache_slot, inc, EX_VAR(opline->result.var)); } } while (0); @@ -32119,6 +32627,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP zval *property; zval *value; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_obj_zval_ptr_unused(execute_data); @@ -32147,9 +32657,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP } /* here we are sure we are dealing with an object */ + cache_slot = (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -32158,13 +32668,37 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP ZVAL_DEREF(zptr); SEPARATE_ZVAL_NOREF(zptr); - binary_op(zptr, zptr, value); - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + binary_op(&z_copy, &z_copy, value); + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + binary_op(zptr, zptr, value); + } + + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_assign_op_overloaded_property(object, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_assign_op_overloaded_property(object, property, cache_slot, value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -32765,6 +33299,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_obj_zval_ptr_unused(execute_data); @@ -32790,9 +33326,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } /* here we are sure we are dealing with an object */ + cache_slot = (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -32804,22 +33340,71 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); - SEPARATE_ZVAL_NOREF(zptr); - if (inc) { - increment_function(zptr); + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } } else { - decrement_function(zptr); + SEPARATE_ZVAL_NOREF(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_pre_incdec_overloaded_property(object, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_pre_incdec_overloaded_property(object, property, cache_slot, inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -32844,6 +33429,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_obj_zval_ptr_unused(execute_data); @@ -32867,10 +33454,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } /* here we are sure we are dealing with an object */ - + cache_slot = (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { ZVAL_NULL(EX_VAR(opline->result.var)); } else { @@ -32881,19 +33467,68 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr); - zval_opt_copy_ctor(zptr); - if (inc) { - increment_function(zptr); + + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + ZVAL_COPY_VALUE(zptr, val); + } } else { - decrement_function(zptr); + zval_opt_copy_ctor(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } } } else { - zend_post_incdec_overloaded_property(object, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, EX_VAR(opline->result.var)); + zend_post_incdec_overloaded_property(object, property, cache_slot, inc, EX_VAR(opline->result.var)); } } while (0); @@ -34740,6 +35375,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP zval *property; zval *value; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_obj_zval_ptr_unused(execute_data); @@ -34768,9 +35405,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP } /* here we are sure we are dealing with an object */ + cache_slot = ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -34779,13 +35416,37 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP ZVAL_DEREF(zptr); SEPARATE_ZVAL_NOREF(zptr); - binary_op(zptr, zptr, value); - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + binary_op(&z_copy, &z_copy, value); + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + binary_op(zptr, zptr, value); + } + + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_assign_op_overloaded_property(object, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_assign_op_overloaded_property(object, property, cache_slot, value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -35387,6 +36048,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_obj_zval_ptr_unused(execute_data); @@ -35412,9 +36075,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } /* here we are sure we are dealing with an object */ + cache_slot = ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -35426,22 +36089,71 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); - SEPARATE_ZVAL_NOREF(zptr); - if (inc) { - increment_function(zptr); + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } } else { - decrement_function(zptr); + SEPARATE_ZVAL_NOREF(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_pre_incdec_overloaded_property(object, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_pre_incdec_overloaded_property(object, property, cache_slot, inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -35467,6 +36179,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_obj_zval_ptr_unused(execute_data); @@ -35490,10 +36204,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } /* here we are sure we are dealing with an object */ - + cache_slot = ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { ZVAL_NULL(EX_VAR(opline->result.var)); } else { @@ -35504,19 +36217,68 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr); - zval_opt_copy_ctor(zptr); - if (inc) { - increment_function(zptr); + + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); } else { - decrement_function(zptr); + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + ZVAL_COPY_VALUE(zptr, val); + } + } else { + zval_opt_copy_ctor(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } } } else { - zend_post_incdec_overloaded_property(object, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, EX_VAR(opline->result.var)); + zend_post_incdec_overloaded_property(object, property, cache_slot, inc, EX_VAR(opline->result.var)); } } while (0); @@ -39622,6 +40384,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP zval *property; zval *value; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_cv_BP_VAR_RW(execute_data, opline->op1.var); @@ -39650,9 +40414,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP } /* here we are sure we are dealing with an object */ + cache_slot = (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -39661,13 +40425,37 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP ZVAL_DEREF(zptr); SEPARATE_ZVAL_NOREF(zptr); - binary_op(zptr, zptr, value); - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + binary_op(&z_copy, &z_copy, value); + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + binary_op(zptr, zptr, value); + } + + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_assign_op_overloaded_property(object, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_assign_op_overloaded_property(object, property, cache_slot, value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -40538,6 +41326,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_cv_BP_VAR_RW(execute_data, opline->op1.var); @@ -40563,9 +41353,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } /* here we are sure we are dealing with an object */ + cache_slot = (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -40577,22 +41367,71 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); - SEPARATE_ZVAL_NOREF(zptr); - if (inc) { - increment_function(zptr); + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } } else { - decrement_function(zptr); + SEPARATE_ZVAL_NOREF(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_pre_incdec_overloaded_property(object, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_pre_incdec_overloaded_property(object, property, cache_slot, inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -40617,6 +41456,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_cv_BP_VAR_RW(execute_data, opline->op1.var); @@ -40640,10 +41481,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } /* here we are sure we are dealing with an object */ - + cache_slot = (IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { ZVAL_NULL(EX_VAR(opline->result.var)); } else { @@ -40654,19 +41494,68 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr); - zval_opt_copy_ctor(zptr); - if (inc) { - increment_function(zptr); + + if (IS_CONST == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); } else { - decrement_function(zptr); + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + ZVAL_COPY_VALUE(zptr, val); + } + } else { + zval_opt_copy_ctor(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } } } else { - zend_post_incdec_overloaded_property(object, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, EX_VAR(opline->result.var)); + zend_post_incdec_overloaded_property(object, property, cache_slot, inc, EX_VAR(opline->result.var)); } } while (0); @@ -46905,6 +47794,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP zval *property; zval *value; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_cv_BP_VAR_RW(execute_data, opline->op1.var); @@ -46933,9 +47824,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP } /* here we are sure we are dealing with an object */ + cache_slot = (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -46944,13 +47835,37 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP ZVAL_DEREF(zptr); SEPARATE_ZVAL_NOREF(zptr); - binary_op(zptr, zptr, value); - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + binary_op(&z_copy, &z_copy, value); + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + binary_op(zptr, zptr, value); + } + + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_assign_op_overloaded_property(object, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_assign_op_overloaded_property(object, property, cache_slot, value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -47821,6 +48736,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_cv_BP_VAR_RW(execute_data, opline->op1.var); @@ -47846,9 +48763,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } /* here we are sure we are dealing with an object */ + cache_slot = (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -47860,22 +48777,71 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); - SEPARATE_ZVAL_NOREF(zptr); - if (inc) { - increment_function(zptr); + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } } else { - decrement_function(zptr); + SEPARATE_ZVAL_NOREF(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_pre_incdec_overloaded_property(object, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_pre_incdec_overloaded_property(object, property, cache_slot, inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -47900,6 +48866,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_cv_BP_VAR_RW(execute_data, opline->op1.var); @@ -47923,10 +48891,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } /* here we are sure we are dealing with an object */ - + cache_slot = (IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { ZVAL_NULL(EX_VAR(opline->result.var)); } else { @@ -47937,19 +48904,68 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr); - zval_opt_copy_ctor(zptr); - if (inc) { - increment_function(zptr); + + if (IS_CV == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); } else { - decrement_function(zptr); + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + ZVAL_COPY_VALUE(zptr, val); + } + } else { + zval_opt_copy_ctor(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } } } else { - zend_post_incdec_overloaded_property(object, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, EX_VAR(opline->result.var)); + zend_post_incdec_overloaded_property(object, property, cache_slot, inc, EX_VAR(opline->result.var)); } } while (0); @@ -51174,6 +52190,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP zval *property; zval *value; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_cv_BP_VAR_RW(execute_data, opline->op1.var); @@ -51202,9 +52220,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP } /* here we are sure we are dealing with an object */ + cache_slot = ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -51213,13 +52231,37 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SP ZVAL_DEREF(zptr); SEPARATE_ZVAL_NOREF(zptr); - binary_op(zptr, zptr, value); - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + binary_op(&z_copy, &z_copy, value); + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } + } else { + binary_op(zptr, zptr, value); + } + + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_assign_op_overloaded_property(object, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_assign_op_overloaded_property(object, property, cache_slot, value, binary_op, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -52092,6 +53134,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_cv_BP_VAR_RW(execute_data, opline->op1.var); @@ -52117,9 +53161,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } /* here we are sure we are dealing with an object */ + cache_slot = ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_NULL(EX_VAR(opline->result.var)); @@ -52131,22 +53175,71 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_pre_incdec_property_helper_SPE } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); - SEPARATE_ZVAL_NOREF(zptr); - if (inc) { - increment_function(zptr); + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + zval_ptr_dtor(zptr); + ZVAL_COPY_VALUE(zptr, val); + } } else { - decrement_function(zptr); + SEPARATE_ZVAL_NOREF(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } - if (UNEXPECTED(RETURN_VALUE_USED(opline))) { + if (UNEXPECTED(RETURN_VALUE_USED(opline)) && EXPECTED(!EG(exception))) { ZVAL_COPY(EX_VAR(opline->result.var), zptr); } } } else { - zend_pre_incdec_overloaded_property(object, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); + zend_pre_incdec_overloaded_property(object, property, cache_slot, inc, (UNEXPECTED(RETURN_VALUE_USED(opline)) ? EX_VAR(opline->result.var) : NULL)); } } while (0); @@ -52172,6 +53265,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP zval *object; zval *property; zval *zptr; + void **cache_slot; + zend_property_info *prop_info; SAVE_OPLINE(); object = _get_zval_ptr_cv_BP_VAR_RW(execute_data, opline->op1.var); @@ -52195,10 +53290,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } /* here we are sure we are dealing with an object */ - + cache_slot = ((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL; if (EXPECTED(Z_OBJ_HT_P(object)->get_property_ptr_ptr) - && EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) - && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL))) != NULL)) { + && EXPECTED((zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, cache_slot)) != NULL)) { if (UNEXPECTED(Z_ISERROR_P(zptr))) { ZVAL_NULL(EX_VAR(opline->result.var)); } else { @@ -52209,19 +53303,68 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_post_incdec_property_helper_SP } else { fast_long_decrement_function(zptr); } + if (UNEXPECTED(Z_TYPE_P(zptr) != IS_LONG)) { + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + zval tmp, *val; + + val = zend_verify_property_type(prop_info, zptr, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), zptr); + if (inc) { + ZVAL_LONG(zptr, ZEND_LONG_MAX); + } else { + ZVAL_LONG(zptr, ZEND_LONG_MIN); + } + } + } + } } else { ZVAL_DEREF(zptr); ZVAL_COPY_VALUE(EX_VAR(opline->result.var), zptr); - zval_opt_copy_ctor(zptr); - if (inc) { - increment_function(zptr); + + if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { + prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2); + } else { + prop_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR_P(property), 1); + } + if (EXPECTED(prop_info) + && (UNEXPECTED(prop_info != ZEND_WRONG_PROPERTY_INFO)) + && UNEXPECTED(prop_info->type)) { + /* special case for typed properties */ + zval z_copy, tmp, *val; + + ZVAL_DUP(&z_copy, zptr); + if (inc) { + increment_function(&z_copy); + } else { + decrement_function(&z_copy); + } + val = zend_verify_property_type(prop_info, &z_copy, &tmp, EX_USES_STRICT_TYPES()); + if (UNEXPECTED(!val)) { + zend_verify_property_type_error(prop_info, Z_STR_P(property), &z_copy); + zval_ptr_dtor(&z_copy); + } else { + ZVAL_COPY_VALUE(zptr, val); + } } else { - decrement_function(zptr); + zval_opt_copy_ctor(zptr); + if (inc) { + increment_function(zptr); + } else { + decrement_function(zptr); + } } } } } else { - zend_post_incdec_overloaded_property(object, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), inc, EX_VAR(opline->result.var)); + zend_post_incdec_overloaded_property(object, property, cache_slot, inc, EX_VAR(opline->result.var)); } } while (0);
« previous php.cvs (#95519) next »