com php-src: Optimize property fetching and fix edge cases with __get(): Zend/tests/type_declarations/typed_pro perties_003.phpt
Zend/tests/type_declarations/typ ed_properties_009.phpt Zend/tests/type_declarat ions/typed_properties_036.phpt Zend/tests/type_
declarations/typed_properties_040.phpt Zend/zend _API.c Zend/zend_execute.c Zend/zend_execute.h Zend/zend_object_handlers.c Zend/zend_types.h
Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/s tandard/
| From: | Bob Weinand | Date: | Mon, 23 May 2016 20:55:44 +0000 |
| Subject: | com php-src: Optimize property fetching and fix edge cases with __get(): Zend/tests/type_declarations/typed_pro perties_003.phpt Zend/tests/type_declarations/typ ed_properties_009.phpt Zend/tests/type_declarat ions/typed_properties_036.phpt Zend/tests/type_ declarations/typed_properties_040.phpt Zend/zend _API.c Zend/zend_execute.c Zend/zend_execute.h Zend/zend_object_handlers.c Zend/zend_types.h Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/s tandard/ |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95549@lists.php.net to get a copy of this message | ||
Commit: 403dabfa67c9a73c83d2197c306f1c4a4806e829
Author: Bob Weinand <bobwei9@hotmail.com> Mon, 23 May 2016 22:55:44 +0200
Parents: 9282b8272e1303e8a241f8d3a9ba4d9f4dfaa177
Branches: typed_ref_properties
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=403dabfa67c9a73c83d2197c306f1c4a4806e829
Log:
Optimize property fetching and fix edge cases with __get()
Changed paths:
M Zend/tests/type_declarations/typed_properties_003.phpt
M Zend/tests/type_declarations/typed_properties_009.phpt
M Zend/tests/type_declarations/typed_properties_036.phpt
A Zend/tests/type_declarations/typed_properties_040.phpt
M Zend/zend_API.c
M Zend/zend_execute.c
M Zend/zend_execute.h
M Zend/zend_object_handlers.c
M Zend/zend_types.h
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
M ext/standard/var.c
diff --git a/Zend/tests/type_declarations/typed_properties_003.phpt b/Zend/tests/type_declarations/typed_properties_003.phpt index 36337b3..90ee16c 100644 --- a/Zend/tests/type_declarations/typed_properties_003.phpt +++ b/Zend/tests/type_declarations/typed_properties_003.phpt @@ -9,9 +9,12 @@ $thing = new class() { $var = &$thing->int; ?> --EXPECTF-- -Fatal error: Uncaught TypeError: Typed property class@anonymous::$int must not be referenced in %s:6 +Fatal error: Uncaught TypeError: Typed property class@anonymous::$int must not be accessed before initialization in %s:%d Stack trace: #0 {main} - thrown in %s on line 6 +Next TypeError: Typed property class@anonymous::$int must not be referenced in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/Zend/tests/type_declarations/typed_properties_009.phpt b/Zend/tests/type_declarations/typed_properties_009.phpt index 9c0b1ff..c4c34dc 100644 --- a/Zend/tests/type_declarations/typed_properties_009.phpt +++ b/Zend/tests/type_declarations/typed_properties_009.phpt @@ -7,6 +7,7 @@ class Foo { public function __get($name) { var_dump($name); + /* implicit return null, weakly cast to int(0) */ } } @@ -18,10 +19,4 @@ var_dump($foo->bar); ?> --EXPECTF-- string(3) "bar" - -Fatal error: Uncaught TypeError: Typed property Foo::$bar must not be accessed before initialization in %s:14 -Stack trace: -#0 {main} - thrown in %s on line 14 - - +int(0) diff --git a/Zend/tests/type_declarations/typed_properties_036.phpt b/Zend/tests/type_declarations/typed_properties_036.phpt index 4048e37..e98c881 100644 --- a/Zend/tests/type_declarations/typed_properties_036.phpt +++ b/Zend/tests/type_declarations/typed_properties_036.phpt @@ -1,19 +1,15 @@ --TEST-- -Test typed properties normal foreach must not yield null +Test unitialized typed properties normal foreach must not be yielded --FILE-- <?php $foo = new class { public int $bar = 10, $qux; }; -foreach ($foo as $key => $bar) +foreach ($foo as $key => $bar) { var_dump($key, $bar); +} +?> --EXPECTF-- string(3) "bar" int(10) - -Fatal error: Uncaught TypeError: Typed property class@anonymous::$qux must not be accessed before initialization in %s:6 -Stack trace: -#0 {main} - thrown in %s on line 6 - diff --git a/Zend/tests/type_declarations/typed_properties_040.phpt b/Zend/tests/type_declarations/typed_properties_040.phpt new file mode 100644 index 0000000..075fbb1 --- /dev/null +++ b/Zend/tests/type_declarations/typed_properties_040.phpt @@ -0,0 +1,26 @@ +--TEST-- +Test __get on unset typed property must fail properly +--FILE-- +<?php +declare(strict_types=1); + +class Foo { + public int $bar; + + public function __get($name) { + var_dump($name); + } +} + +$foo = new Foo(); + +var_dump($foo->bar); +?> +--EXPECTF-- +string(3) "bar" + +Fatal error: Uncaught TypeError: Typed property Foo::$bar must be integer, null used in %s:14 +Stack trace: +#0 {main} + thrown in %s on line 14 + diff --git a/Zend/zend_API.c b/Zend/zend_API.c index d1a33ef..59d0dd9 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3626,7 +3626,7 @@ ZEND_API int zend_declare_typed_property(zend_class_entry *ce, zend_string *name } } - if (Z_ISUNDEF_P(property)) { + if (Z_ISUNDEF_P(property) && !optional_type) { ZVAL_NULL(property); } diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index fbd4d0d..803a678 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -817,9 +817,14 @@ static inline zend_bool zend_verify_scalar_property_type(zend_uchar type, zval * return ZEND_SAME_FAKE_TYPE(type, Z_TYPE_P(property)); } -void zend_verify_property_type_error(zend_property_info *info, zend_string *name, zval *property) { +ZEND_COLD zend_never_inline void zend_verify_property_type_error(zend_property_info *info, zend_string *name, zval *property) { zend_string *resolved = zend_resolve_property_type(info->type_name, info->ce); - + + /* we _may_ land here in case reading already errored and runtime cache thus has not been updated (i.e. it contains a valid but unrelated info) */ + if (EG(exception)) { + return; + } + if (info->type == IS_OBJECT) { zend_throw_exception_ex(zend_ce_type_error, info->type, "Typed property %s::$%s must be an instance of %s, %s used", @@ -1517,22 +1522,6 @@ static zend_never_inline void zend_post_incdec_overloaded_property(zval *object, ZVAL_COPY(result, z); } - if (Z_TYPE_P(property) == IS_STRING && !Z_VERIFIED_P(result) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(property), cache_slot); - - if (prop_info) { - if (Z_TYPE_P(result) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(property)); - OBJ_RELEASE(Z_OBJ(obj)); - zval_ptr_dtor(z); - return; - } - } - } - ZVAL_DUP(&z_copy, result); if (inc) { increment_function(&z_copy); @@ -1553,10 +1542,9 @@ static zend_never_inline void zend_post_incdec_overloaded_property(zval *object, static zend_never_inline void zend_pre_incdec_overloaded_property(zval *object, zval *property, void **cache_slot, int inc, zval *result) { zval rv; - zend_property_info *prop_info = NULL; if (Z_OBJ_HT_P(object)->read_property && Z_OBJ_HT_P(object)->write_property) { - zval *z, obj; + zval *z, obj, prev; ZVAL_OBJ(&obj, Z_OBJ_P(object)); Z_ADDREF(obj); @@ -1577,56 +1565,21 @@ static zend_never_inline void zend_pre_incdec_overloaded_property(zval *object, } ZVAL_DEREF(z); SEPARATE_ZVAL_NOREF(z); - if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && - (Z_TYPE_P(property) == IS_STRING) && - (prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(property), cache_slot)))) { - zval tmp; - - if (Z_TYPE_P(z) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(property)); - OBJ_RELEASE(Z_OBJ(obj)); - return; - } - - ZVAL_DUP(&tmp, z); - - if (inc) { - increment_function(&tmp); - } else { - decrement_function(&tmp); - } - - if (UNEXPECTED(!zend_verify_property_type(prop_info, &tmp, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data))))) { - zend_verify_property_type_error(prop_info, Z_STR_P(property), &tmp); - OBJ_RELEASE(Z_OBJ(obj)); - zval_dtor(&tmp); - return; - } - - zval_ptr_dtor(z); - ZVAL_COPY_VALUE(z, &tmp); - Z_TYPE_FLAGS_P(z) |= IS_TYPE_VERIFIED; - - if (UNEXPECTED(result)) { - ZVAL_COPY(result, z); - } - - Z_OBJ_HT(obj)->write_property(&obj, property, z, cache_slot); + ZVAL_COPY_VALUE(&prev, z); + if (inc) { + increment_function(z); } else { - if (inc) { - increment_function(z); - } else { - decrement_function(z); - } - if (UNEXPECTED(result)) { - ZVAL_COPY(result, z); - } - Z_OBJ_HT(obj)->write_property(&obj, property, z, cache_slot); + decrement_function(z); } - + if (UNEXPECTED(result)) { + ZVAL_COPY(result, z); + } + Z_OBJ_HT(obj)->write_property(&obj, property, z, cache_slot); + + if (UNEXPECTED(EG(exception))) { + ZVAL_COPY_VALUE(z, &prev); + } + OBJ_RELEASE(Z_OBJ(obj)); zval_ptr_dtor(z); } else { @@ -1640,12 +1593,14 @@ static zend_never_inline void zend_pre_incdec_overloaded_property(zval *object, static zend_never_inline void zend_assign_op_overloaded_property(zval *object, zval *property, void **cache_slot, zval *value, binary_op_type binary_op, zval *result) { zval *z; - zval rv, obj; + zval rv, obj, prev; zval *zptr; ZVAL_OBJ(&obj, Z_OBJ_P(object)); Z_ADDREF(obj); if (EXPECTED(Z_OBJ_HT(obj)->read_property)) { + zend_property_info *prop_info; + z = Z_OBJ_HT(obj)->read_property(&obj, property, BP_VAR_R, cache_slot, &rv); if (UNEXPECTED(EG(exception))) { OBJ_RELEASE(Z_OBJ(obj)); @@ -1664,42 +1619,16 @@ static zend_never_inline void zend_assign_op_overloaded_property(zval *object, z ZVAL_DEREF(z); SEPARATE_ZVAL_NOREF(z); - if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE(obj)) && Z_TYPE_P(property) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(property), cache_slot); - - if (prop_info) { - zval tmp; - - if (Z_TYPE_P(z) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(property)); - OBJ_RELEASE(Z_OBJ(obj)); - return; - } - - binary_op(&tmp, z, value); - if (!zend_verify_property_type(prop_info, &tmp, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { - zend_verify_property_type_error(prop_info, Z_STR_P(property), &tmp); - OBJ_RELEASE(Z_OBJ(obj)); - zval_dtor(&tmp); - return; - } - zval_ptr_dtor(z); - Z_TYPE_FLAGS(tmp) |= IS_TYPE_VERIFIED; - ZVAL_COPY(z, &tmp); - } else { - binary_op(z, z, value); - } - } else { - binary_op(z, z, value); - } + ZVAL_COPY_VALUE(&prev, z); + binary_op(z, z, value); Z_OBJ_HT(obj)->write_property(&obj, property, z, cache_slot); if (UNEXPECTED(result)) { ZVAL_COPY(result, z); } + if (UNEXPECTED(EG(exception))) { + ZVAL_COPY_VALUE(z, &prev); + } zval_ptr_dtor(zptr); } else { zend_error(E_WARNING, "Attempt to assign property of non-object"); diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 19d6f8e..e54e0aa 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -388,11 +388,16 @@ static zend_always_inline zend_bool _zend_object_has_type_hints(zval *object) { static zend_always_inline zend_property_info* zend_object_fetch_property_type_info_ex(zval *object, zend_string *property, void **cache_slot) { zend_property_info *info; - - if (cache_slot && EXPECTED(Z_OBJCE_P(object) == CACHED_PTR_EX(cache_slot))) { + + /* if we have a cache_slot, let's assume it's valid. Callers task to ensure validity! */ + if (EXPECTED(cache_slot)) { return (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); } + if (EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)))) { + return NULL; + } + info = zend_get_property_info(Z_OBJCE_P(object), property, 1); if (UNEXPECTED(info && info != ZEND_WRONG_PROPERTY_INFO && info->type)) { @@ -404,18 +409,12 @@ static zend_always_inline zend_property_info* zend_object_fetch_property_type_in static zend_always_inline zend_property_info* zend_object_fetch_property_type_info(zval *object, zval *property, void **cache_slot) { - if (UNEXPECTED(Z_TYPE_P(property) != IS_STRING)) { - return NULL; + if (EXPECTED(cache_slot)) { + return (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); } - if (UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) { - if (Z_ISREF_P(object)) { - object = Z_REFVAL_P(object); - if (Z_TYPE_P(object) != IS_OBJECT) - return NULL; - } else { - return NULL; - } + if (UNEXPECTED(Z_TYPE_P(property) != IS_STRING)) { + return NULL; } return zend_object_fetch_property_type_info_ex(object, Z_STR_P(property), cache_slot); diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 375db9d..e625c97 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -682,6 +682,13 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ retval = &EG(uninitialized_zval); } zval_ptr_dtor(&tmp_object); + + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(zobj->ce) && + (prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot)))) { + if (!UNEXPECTED(zend_verify_property_type(prop_info, retval, (zobj->ce->__get->common.fn_flags & ZEND_ACC_STRICT_TYPES) != 0))) { + zend_verify_property_type_error(prop_info, Z_STR_P(member), retval); + } + } goto exit; } else { if (Z_STRVAL_P(member)[0] == '\0') { @@ -698,9 +705,12 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ } } if ((type != BP_VAR_IS)) { - if (EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(zobj->ce) || - !(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot)) || - !prop_info->type)) { + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot))) { + zend_throw_exception_ex(zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be accessed before initialization", + ZSTR_VAL(prop_info->ce->name), + Z_STRVAL_P(member)); + } else { zend_error(E_NOTICE,"Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), Z_STRVAL_P(member)); } } @@ -747,19 +757,15 @@ ZEND_API void zend_std_write_property(zval *object, zval *member, zval *value, v zobj->properties = zend_array_dup(zobj->properties); } if ((variable_ptr = zend_hash_find(zobj->properties, Z_STR_P(member))) != NULL) { + zend_property_info *prop_info; found: - if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(zobj->ce) && Z_TYPE_P(member) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot); - - if (prop_info) { - if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { - zend_verify_property_type_error(prop_info, Z_STR_P(member), value); - goto exit; - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot))) { + if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { + zend_verify_property_type_error(prop_info, Z_STR_P(member), value); + goto exit; } } zend_assign_to_variable(variable_ptr, value, IS_CV); - Z_TYPE_FLAGS_P(variable_ptr) |= IS_TYPE_VERIFIED; /* we can also assign this to untyped properties in order to avoid a ce fetch upon reading */ goto exit; } } @@ -809,6 +815,13 @@ write_std_property: } if (EXPECTED(property_offset != ZEND_DYNAMIC_PROPERTY_OFFSET)) { + zend_property_info *prop_info; + if (cache_slot ? UNEXPECTED(prop_info = (zend_property_info *) CACHED_PTR_EX(cache_slot + 2)) : UNEXPECTED(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), NULL))) { + if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { + zend_verify_property_type_error(prop_info, Z_STR_P(member), value); + goto exit; + } + } ZVAL_COPY_VALUE(OBJ_PROP(zobj, property_offset), value); } else { if (!zobj->properties) { diff --git a/Zend/zend_types.h b/Zend/zend_types.h index 81ca927..45c2ebd 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -395,7 +395,6 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) { #define IS_TYPE_REFCOUNTED (1<<2) #define IS_TYPE_COLLECTABLE (1<<3) #define IS_TYPE_COPYABLE (1<<4) -#define IS_TYPE_VERIFIED (1<<5) /* extended types */ #define IS_INTERNED_STRING_EX IS_STRING @@ -472,9 +471,6 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) { #define Z_IMMUTABLE(zval) ((Z_TYPE_FLAGS(zval) & IS_TYPE_IMMUTABLE) != 0) #define Z_IMMUTABLE_P(zval_p) Z_IMMUTABLE(*(zval_p)) -#define Z_VERIFIED(zval) ((Z_TYPE_FLAGS(zval) & IS_TYPE_VERIFIED) != 0) -#define Z_VERIFIED_P(zval_p) Z_VERIFIED(*(zval_p)) - /* the following Z_OPT_* macros make better code when Z_TYPE_INFO accessed before */ #define Z_OPT_TYPE(zval) (Z_TYPE_INFO(zval) & Z_TYPE_MASK) #define Z_OPT_TYPE_P(zval_p) Z_OPT_TYPE(*(zval_p)) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index b7d2bd9..431b1fd 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1944,24 +1944,6 @@ ZEND_VM_C_LABEL(fetch_obj_r_no_object): } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - ZEND_VM_C_LABEL(fetch_obj_r_exit): FREE_OP2(); FREE_OP1(); @@ -1974,6 +1956,7 @@ ZEND_VM_HANDLER(85, ZEND_FETCH_OBJ_W, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV) zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = GET_OP2_ZVAL_PTR(BP_VAR_R); @@ -1987,17 +1970,13 @@ ZEND_VM_HANDLER(85, ZEND_FETCH_OBJ_W, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV) zend_fetch_property_address(EX_VAR(opline->result.var), container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((OP2_TYPE != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -2015,6 +1994,7 @@ ZEND_VM_HANDLER(88, ZEND_FETCH_OBJ_RW, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV) zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = GET_OP2_ZVAL_PTR(BP_VAR_R); @@ -2026,21 +2006,18 @@ ZEND_VM_HANDLER(88, ZEND_FETCH_OBJ_RW, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV) HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); FREE_OP2(); if (OP1_TYPE == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -2131,6 +2108,7 @@ ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, CONST|TMP|VAR|UNUSED|THIS|CV, CONST /* Behave like FETCH_OBJ_W */ zend_free_op free_op1, free_op2; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = GET_OP2_ZVAL_PTR(BP_VAR_R); @@ -2147,20 +2125,17 @@ ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, CONST|TMP|VAR|UNUSED|THIS|CV, CONST FREE_OP1_VAR_PTR(); HANDLE_EXCEPTION(); } - - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } - } - zend_fetch_property_address(EX_VAR(opline->result.var), container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); + + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); + } + FREE_OP2(); if (OP1_TYPE == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -2292,13 +2267,12 @@ ZEND_VM_C_LABEL(fast_assign_obj): zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (OP_DATA_TYPE == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, OP_DATA_TYPE); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -6152,24 +6126,6 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH_R, VAR, ANY, JMP_ADDR) p++; } - if (UNEXPECTED(p->key && !Z_VERIFIED_P(value) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(array)))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(array, p->key, NULL); - - if (UNEXPECTED(prop_info)) { - if (UNEXPECTED(Z_TYPE_P(value) == IS_NULL)) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - ZSTR_VAL(p->key)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, p->key, value); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(value) |= IS_TYPE_VERIFIED; - } - if (opline->result_type & (IS_TMP_VAR|IS_CV)) { if (UNEXPECTED(!p->key)) { ZVAL_LONG(EX_VAR(opline->result.var), p->h); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 4b511cf..6375301 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -4995,24 +4995,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: @@ -5100,6 +5082,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -5117,20 +5100,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_CONST == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -8848,24 +8827,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: @@ -8953,6 +8914,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -8970,20 +8932,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_CONST == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -10787,24 +10745,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op2); @@ -10893,6 +10833,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ /* Behave like FETCH_OBJ_W */ zend_free_op free_op1, free_op2; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -10910,19 +10851,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); zval_ptr_dtor_nogc(free_op2); if (IS_CONST == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -13298,24 +13236,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op1); @@ -13331,6 +13251,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CO /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -13348,20 +13269,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CO HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_TMP_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -14550,24 +14467,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op1); @@ -14583,6 +14482,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -14600,20 +14500,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_TMP_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -15105,24 +15001,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); @@ -15138,6 +15016,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TM /* Behave like FETCH_OBJ_W */ zend_free_op free_op1, free_op2; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -15155,19 +15034,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TM HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); zval_ptr_dtor_nogc(free_op2); if (IS_TMP_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -16601,24 +16477,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_FETCH_R_SPEC_VAR_HANDLER(ZE p++; } - if (UNEXPECTED(p->key && !Z_VERIFIED_P(value) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(array)))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(array, p->key, NULL); - - if (UNEXPECTED(prop_info)) { - if (UNEXPECTED(Z_TYPE_P(value) == IS_NULL)) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - ZSTR_VAL(p->key)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, p->key, value); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(value) |= IS_TYPE_VERIFIED; - } - if (opline->result_type & (IS_TMP_VAR|IS_CV)) { if (UNEXPECTED(!p->key)) { ZVAL_LONG(EX_VAR(opline->result.var), p->h); @@ -18422,24 +18280,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op1); @@ -18452,6 +18292,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_CONST_HAN zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -18465,17 +18306,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_CONST_HAN zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((IS_CONST != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -18492,6 +18329,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_CONST_HA zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -18503,22 +18341,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_CONST_HA HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -18535,6 +18369,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CO /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -18552,20 +18387,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CO HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -18683,13 +18514,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -18881,13 +18711,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -19079,13 +18908,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -19277,13 +19105,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -23612,24 +23439,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op1); @@ -23642,6 +23451,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_CV_HANDLE zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -23655,17 +23465,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_CV_HANDLE zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((IS_CV != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -23682,6 +23488,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_CV_HANDL zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -23693,22 +23500,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_CV_HANDL HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -23725,6 +23528,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -23742,20 +23546,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -23873,13 +23673,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -24071,13 +23870,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -24269,13 +24067,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -24467,13 +24264,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -26905,24 +26701,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); @@ -26935,6 +26713,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_TMPVAR_HA zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -26948,17 +26727,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_TMPVAR_HA zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (((IS_TMP_VAR|IS_VAR) != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -26976,6 +26751,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_TMPVAR_H zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -26987,21 +26763,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_TMPVAR_H HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); zval_ptr_dtor_nogc(free_op2); if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -27019,6 +26792,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TM /* Behave like FETCH_OBJ_W */ zend_free_op free_op1, free_op2; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -27036,19 +26810,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TM HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); zval_ptr_dtor_nogc(free_op2); if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -27167,13 +26938,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -27365,13 +27135,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -27563,13 +27332,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -27761,13 +27529,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -29760,24 +29527,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: @@ -29790,6 +29539,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_CONST_ zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -29803,17 +29553,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_CONST_ zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((IS_CONST != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -29830,6 +29576,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CONST zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -29841,22 +29588,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CONST HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -29945,6 +29688,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -29962,20 +29706,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -30093,13 +29833,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -30291,13 +30030,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -30489,13 +30227,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -30687,13 +30424,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -33591,24 +33327,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: @@ -33621,6 +33339,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_CV_HAN zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -33634,17 +33353,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_CV_HAN zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((IS_CV != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -33661,6 +33376,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CV_HA zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -33672,22 +33388,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CV_HA HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -33776,6 +33488,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -33793,20 +33506,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -33924,13 +33633,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -34122,13 +33830,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -34320,13 +34027,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -34518,13 +34224,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -36308,24 +36013,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op2); @@ -36338,6 +36025,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_TMPVAR zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -36351,17 +36039,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_TMPVAR zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (((IS_TMP_VAR|IS_VAR) != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -36379,6 +36063,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_TMPVA zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -36390,21 +36075,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_TMPVA HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); zval_ptr_dtor_nogc(free_op2); if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -36495,6 +36177,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED /* Behave like FETCH_OBJ_W */ zend_free_op free_op1, free_op2; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -36512,19 +36195,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); zval_ptr_dtor_nogc(free_op2); if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -36643,13 +36323,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -36841,13 +36520,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -37039,13 +36717,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -37237,13 +36914,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -41828,24 +41504,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: @@ -41858,6 +41516,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_CONST_HAND zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -41871,17 +41530,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_CONST_HAND zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((IS_CONST != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -41898,6 +41553,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_CONST_HAN zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -41909,22 +41565,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_CONST_HAN HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -42013,6 +41665,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CON /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -42030,20 +41683,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CON HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -42174,13 +41823,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -42372,13 +42020,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -42570,13 +42217,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -42768,13 +42414,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -49065,24 +48710,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: @@ -49095,6 +48722,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_CV_HANDLER zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -49108,17 +48736,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_CV_HANDLER zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((IS_CV != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -49135,6 +48759,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_CV_HANDLE zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -49146,22 +48771,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_CV_HANDLE HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -49250,6 +48871,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_ /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -49267,20 +48889,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_ HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -49411,13 +49029,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -49609,13 +49226,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -49807,13 +49423,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -50005,13 +49620,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -53431,24 +53045,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op2); @@ -53461,6 +53057,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_TMPVAR_HAN zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -53474,17 +53071,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_TMPVAR_HAN zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (((IS_TMP_VAR|IS_VAR) != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -53502,6 +53095,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_TMPVAR_HA zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -53513,21 +53107,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_TMPVAR_HA HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); zval_ptr_dtor_nogc(free_op2); if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -53618,6 +53209,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP /* Behave like FETCH_OBJ_W */ zend_free_op free_op1, free_op2; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -53635,19 +53227,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); zval_ptr_dtor_nogc(free_op2); if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -53779,13 +53368,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -53977,13 +53565,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -54175,13 +53762,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -54373,13 +53959,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } diff --git a/ext/standard/var.c b/ext/standard/var.c index 9c55bd4..3041ca0 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -72,12 +72,17 @@ static void php_object_property_dump(zend_property_info *prop_info, zval *zv, ze ZEND_PUTS("]=>\n"); } - if (prop_info && Z_TYPE_P(zv) == IS_NULL) { - php_printf("%*cuninitialized(%s)\n", - level + 1, ' ', - (prop_info->type == IS_OBJECT) ? - ZSTR_VAL(prop_info->type_name) : - zend_get_type_by_const(prop_info->type)); + if (prop_info && Z_TYPE_P(zv) == IS_UNDEF) { + if (prop_info->type) { + php_printf("%*cuninitialized(%s)\n", + level + 1, ' ', + (prop_info->type == IS_OBJECT) ? + ZSTR_VAL(prop_info->type_name) : + zend_get_type_by_const(prop_info->type)); + } else { + php_printf("%*cuninitialized\n", + level + 1, ' '); + } } else { php_var_dump(zv, level + 2); } @@ -164,10 +169,14 @@ again: zend_string *key; zval *val; - ZEND_HASH_FOREACH_KEY_VAL_IND(myht, num, key, val) { + ZEND_HASH_FOREACH_KEY_VAL(myht, num, key, val) { zend_property_info *prop_info = NULL; - if (ZEND_OBJECT_HAS_TYPE_HINTS(struc)) { + if (Z_TYPE_P(val) == IS_INDIRECT) { + val = Z_INDIRECT_P(val); + } + + if (key) { prop_info = zend_object_fetch_property_type_info_ex(struc, key, NULL); } @@ -235,7 +244,7 @@ static void zval_array_element_dump(zval *zv, zend_ulong index, zend_string *key } /* }}} */ -static void zval_object_property_dump(zval *zv, zend_ulong index, zend_string *key, int level) /* {{{ */ +static void zval_object_property_dump(zend_property_info *prop_info, zval *zv, zend_ulong index, zend_string *key, int level) /* {{{ */ { const char *prop_name, *class_name; @@ -256,7 +265,20 @@ static void zval_object_property_dump(zval *zv, zend_ulong index, zend_string *k } ZEND_PUTS("]=>\n"); } - php_debug_zval_dump(zv, level + 2); + if (prop_info && Z_TYPE_P(zv) == IS_UNDEF) { + if (prop_info->type) { + php_printf("%*cuninitialized(%s)\n", + level + 1, ' ', + (prop_info->type == IS_OBJECT) ? + ZSTR_VAL(prop_info->type_name) : + zend_get_type_by_const(prop_info->type)); + } else { + php_printf("%*cuninitialized\n", + level + 1, ' '); + } + } else { + php_debug_zval_dump(zv, level + 2); + } } /* }}} */ @@ -335,8 +357,18 @@ again: php_printf("%sobject(%s)#%d (%d) refcount(%u){\n", COMMON, ZSTR_VAL(class_name), Z_OBJ_HANDLE_P(struc), myht ? zend_array_count(myht) : 0, Z_REFCOUNT_P(struc)); zend_string_release(class_name); if (myht) { - ZEND_HASH_FOREACH_KEY_VAL_IND(myht, index, key, val) { - zval_object_property_dump(val, index, key, level); + ZEND_HASH_FOREACH_KEY_VAL(myht, index, key, val) { + zend_property_info *prop_info = NULL; + + if (Z_TYPE_P(val) == IS_INDIRECT) { + val = Z_INDIRECT_P(val); + } + + if (key) { + prop_info = zend_object_fetch_property_type_info_ex(struc, key, NULL); + } + + zval_object_property_dump(prop_info, val, index, key, level); } ZEND_HASH_FOREACH_END(); myht->u.v.nApplyCount--; if (is_temp) {
diff --git a/Zend/tests/type_declarations/typed_properties_003.phpt b/Zend/tests/type_declarations/typed_properties_003.phpt index 36337b3..90ee16c 100644 --- a/Zend/tests/type_declarations/typed_properties_003.phpt +++ b/Zend/tests/type_declarations/typed_properties_003.phpt @@ -9,9 +9,12 @@ $thing = new class() { $var = &$thing->int; ?> --EXPECTF-- -Fatal error: Uncaught TypeError: Typed property class@anonymous::$int must not be referenced in %s:6 +Fatal error: Uncaught TypeError: Typed property class@anonymous::$int must not be accessed before initialization in %s:%d Stack trace: #0 {main} - thrown in %s on line 6 +Next TypeError: Typed property class@anonymous::$int must not be referenced in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/Zend/tests/type_declarations/typed_properties_009.phpt b/Zend/tests/type_declarations/typed_properties_009.phpt index 9c0b1ff..c4c34dc 100644 --- a/Zend/tests/type_declarations/typed_properties_009.phpt +++ b/Zend/tests/type_declarations/typed_properties_009.phpt @@ -7,6 +7,7 @@ class Foo { public function __get($name) { var_dump($name); + /* implicit return null, weakly cast to int(0) */ } } @@ -18,10 +19,4 @@ var_dump($foo->bar); ?> --EXPECTF-- string(3) "bar" - -Fatal error: Uncaught TypeError: Typed property Foo::$bar must not be accessed before initialization in %s:14 -Stack trace: -#0 {main} - thrown in %s on line 14 - - +int(0) diff --git a/Zend/tests/type_declarations/typed_properties_036.phpt b/Zend/tests/type_declarations/typed_properties_036.phpt index 4048e37..e98c881 100644 --- a/Zend/tests/type_declarations/typed_properties_036.phpt +++ b/Zend/tests/type_declarations/typed_properties_036.phpt @@ -1,19 +1,15 @@ --TEST-- -Test typed properties normal foreach must not yield null +Test unitialized typed properties normal foreach must not be yielded --FILE-- <?php $foo = new class { public int $bar = 10, $qux; }; -foreach ($foo as $key => $bar) +foreach ($foo as $key => $bar) { var_dump($key, $bar); +} +?> --EXPECTF-- string(3) "bar" int(10) - -Fatal error: Uncaught TypeError: Typed property class@anonymous::$qux must not be accessed before initialization in %s:6 -Stack trace: -#0 {main} - thrown in %s on line 6 - diff --git a/Zend/tests/type_declarations/typed_properties_040.phpt b/Zend/tests/type_declarations/typed_properties_040.phpt new file mode 100644 index 0000000..075fbb1 --- /dev/null +++ b/Zend/tests/type_declarations/typed_properties_040.phpt @@ -0,0 +1,26 @@ +--TEST-- +Test __get on unset typed property must fail properly +--FILE-- +<?php +declare(strict_types=1); + +class Foo { + public int $bar; + + public function __get($name) { + var_dump($name); + } +} + +$foo = new Foo(); + +var_dump($foo->bar); +?> +--EXPECTF-- +string(3) "bar" + +Fatal error: Uncaught TypeError: Typed property Foo::$bar must be integer, null used in %s:14 +Stack trace: +#0 {main} + thrown in %s on line 14 + diff --git a/Zend/zend_API.c b/Zend/zend_API.c index d1a33ef..59d0dd9 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3626,7 +3626,7 @@ ZEND_API int zend_declare_typed_property(zend_class_entry *ce, zend_string *name } } - if (Z_ISUNDEF_P(property)) { + if (Z_ISUNDEF_P(property) && !optional_type) { ZVAL_NULL(property); } diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index fbd4d0d..803a678 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -817,9 +817,14 @@ static inline zend_bool zend_verify_scalar_property_type(zend_uchar type, zval * return ZEND_SAME_FAKE_TYPE(type, Z_TYPE_P(property)); } -void zend_verify_property_type_error(zend_property_info *info, zend_string *name, zval *property) { +ZEND_COLD zend_never_inline void zend_verify_property_type_error(zend_property_info *info, zend_string *name, zval *property) { zend_string *resolved = zend_resolve_property_type(info->type_name, info->ce); - + + /* we _may_ land here in case reading already errored and runtime cache thus has not been updated (i.e. it contains a valid but unrelated info) */ + if (EG(exception)) { + return; + } + if (info->type == IS_OBJECT) { zend_throw_exception_ex(zend_ce_type_error, info->type, "Typed property %s::$%s must be an instance of %s, %s used", @@ -1517,22 +1522,6 @@ static zend_never_inline void zend_post_incdec_overloaded_property(zval *object, ZVAL_COPY(result, z); } - if (Z_TYPE_P(property) == IS_STRING && !Z_VERIFIED_P(result) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(property), cache_slot); - - if (prop_info) { - if (Z_TYPE_P(result) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(property)); - OBJ_RELEASE(Z_OBJ(obj)); - zval_ptr_dtor(z); - return; - } - } - } - ZVAL_DUP(&z_copy, result); if (inc) { increment_function(&z_copy); @@ -1553,10 +1542,9 @@ static zend_never_inline void zend_post_incdec_overloaded_property(zval *object, static zend_never_inline void zend_pre_incdec_overloaded_property(zval *object, zval *property, void **cache_slot, int inc, zval *result) { zval rv; - zend_property_info *prop_info = NULL; if (Z_OBJ_HT_P(object)->read_property && Z_OBJ_HT_P(object)->write_property) { - zval *z, obj; + zval *z, obj, prev; ZVAL_OBJ(&obj, Z_OBJ_P(object)); Z_ADDREF(obj); @@ -1577,56 +1565,21 @@ static zend_never_inline void zend_pre_incdec_overloaded_property(zval *object, } ZVAL_DEREF(z); SEPARATE_ZVAL_NOREF(z); - if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)) && - (Z_TYPE_P(property) == IS_STRING) && - (prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(property), cache_slot)))) { - zval tmp; - - if (Z_TYPE_P(z) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(property)); - OBJ_RELEASE(Z_OBJ(obj)); - return; - } - - ZVAL_DUP(&tmp, z); - - if (inc) { - increment_function(&tmp); - } else { - decrement_function(&tmp); - } - - if (UNEXPECTED(!zend_verify_property_type(prop_info, &tmp, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data))))) { - zend_verify_property_type_error(prop_info, Z_STR_P(property), &tmp); - OBJ_RELEASE(Z_OBJ(obj)); - zval_dtor(&tmp); - return; - } - - zval_ptr_dtor(z); - ZVAL_COPY_VALUE(z, &tmp); - Z_TYPE_FLAGS_P(z) |= IS_TYPE_VERIFIED; - - if (UNEXPECTED(result)) { - ZVAL_COPY(result, z); - } - - Z_OBJ_HT(obj)->write_property(&obj, property, z, cache_slot); + ZVAL_COPY_VALUE(&prev, z); + if (inc) { + increment_function(z); } else { - if (inc) { - increment_function(z); - } else { - decrement_function(z); - } - if (UNEXPECTED(result)) { - ZVAL_COPY(result, z); - } - Z_OBJ_HT(obj)->write_property(&obj, property, z, cache_slot); + decrement_function(z); } - + if (UNEXPECTED(result)) { + ZVAL_COPY(result, z); + } + Z_OBJ_HT(obj)->write_property(&obj, property, z, cache_slot); + + if (UNEXPECTED(EG(exception))) { + ZVAL_COPY_VALUE(z, &prev); + } + OBJ_RELEASE(Z_OBJ(obj)); zval_ptr_dtor(z); } else { @@ -1640,12 +1593,14 @@ static zend_never_inline void zend_pre_incdec_overloaded_property(zval *object, static zend_never_inline void zend_assign_op_overloaded_property(zval *object, zval *property, void **cache_slot, zval *value, binary_op_type binary_op, zval *result) { zval *z; - zval rv, obj; + zval rv, obj, prev; zval *zptr; ZVAL_OBJ(&obj, Z_OBJ_P(object)); Z_ADDREF(obj); if (EXPECTED(Z_OBJ_HT(obj)->read_property)) { + zend_property_info *prop_info; + z = Z_OBJ_HT(obj)->read_property(&obj, property, BP_VAR_R, cache_slot, &rv); if (UNEXPECTED(EG(exception))) { OBJ_RELEASE(Z_OBJ(obj)); @@ -1664,42 +1619,16 @@ static zend_never_inline void zend_assign_op_overloaded_property(zval *object, z ZVAL_DEREF(z); SEPARATE_ZVAL_NOREF(z); - if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE(obj)) && Z_TYPE_P(property) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(property), cache_slot); - - if (prop_info) { - zval tmp; - - if (Z_TYPE_P(z) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(property)); - OBJ_RELEASE(Z_OBJ(obj)); - return; - } - - binary_op(&tmp, z, value); - if (!zend_verify_property_type(prop_info, &tmp, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { - zend_verify_property_type_error(prop_info, Z_STR_P(property), &tmp); - OBJ_RELEASE(Z_OBJ(obj)); - zval_dtor(&tmp); - return; - } - zval_ptr_dtor(z); - Z_TYPE_FLAGS(tmp) |= IS_TYPE_VERIFIED; - ZVAL_COPY(z, &tmp); - } else { - binary_op(z, z, value); - } - } else { - binary_op(z, z, value); - } + ZVAL_COPY_VALUE(&prev, z); + binary_op(z, z, value); Z_OBJ_HT(obj)->write_property(&obj, property, z, cache_slot); if (UNEXPECTED(result)) { ZVAL_COPY(result, z); } + if (UNEXPECTED(EG(exception))) { + ZVAL_COPY_VALUE(z, &prev); + } zval_ptr_dtor(zptr); } else { zend_error(E_WARNING, "Attempt to assign property of non-object"); diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 19d6f8e..e54e0aa 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -388,11 +388,16 @@ static zend_always_inline zend_bool _zend_object_has_type_hints(zval *object) { static zend_always_inline zend_property_info* zend_object_fetch_property_type_info_ex(zval *object, zend_string *property, void **cache_slot) { zend_property_info *info; - - if (cache_slot && EXPECTED(Z_OBJCE_P(object) == CACHED_PTR_EX(cache_slot))) { + + /* if we have a cache_slot, let's assume it's valid. Callers task to ensure validity! */ + if (EXPECTED(cache_slot)) { return (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); } + if (EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(object)))) { + return NULL; + } + info = zend_get_property_info(Z_OBJCE_P(object), property, 1); if (UNEXPECTED(info && info != ZEND_WRONG_PROPERTY_INFO && info->type)) { @@ -404,18 +409,12 @@ static zend_always_inline zend_property_info* zend_object_fetch_property_type_in static zend_always_inline zend_property_info* zend_object_fetch_property_type_info(zval *object, zval *property, void **cache_slot) { - if (UNEXPECTED(Z_TYPE_P(property) != IS_STRING)) { - return NULL; + if (EXPECTED(cache_slot)) { + return (zend_property_info*) CACHED_PTR_EX(cache_slot + 2); } - if (UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) { - if (Z_ISREF_P(object)) { - object = Z_REFVAL_P(object); - if (Z_TYPE_P(object) != IS_OBJECT) - return NULL; - } else { - return NULL; - } + if (UNEXPECTED(Z_TYPE_P(property) != IS_STRING)) { + return NULL; } return zend_object_fetch_property_type_info_ex(object, Z_STR_P(property), cache_slot); diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 375db9d..e625c97 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -682,6 +682,13 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ retval = &EG(uninitialized_zval); } zval_ptr_dtor(&tmp_object); + + if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(zobj->ce) && + (prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot)))) { + if (!UNEXPECTED(zend_verify_property_type(prop_info, retval, (zobj->ce->__get->common.fn_flags & ZEND_ACC_STRICT_TYPES) != 0))) { + zend_verify_property_type_error(prop_info, Z_STR_P(member), retval); + } + } goto exit; } else { if (Z_STRVAL_P(member)[0] == '\0') { @@ -698,9 +705,12 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ } } if ((type != BP_VAR_IS)) { - if (EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(zobj->ce) || - !(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot)) || - !prop_info->type)) { + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot))) { + zend_throw_exception_ex(zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be accessed before initialization", + ZSTR_VAL(prop_info->ce->name), + Z_STRVAL_P(member)); + } else { zend_error(E_NOTICE,"Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), Z_STRVAL_P(member)); } } @@ -747,19 +757,15 @@ ZEND_API void zend_std_write_property(zval *object, zval *member, zval *value, v zobj->properties = zend_array_dup(zobj->properties); } if ((variable_ptr = zend_hash_find(zobj->properties, Z_STR_P(member))) != NULL) { + zend_property_info *prop_info; found: - if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(zobj->ce) && Z_TYPE_P(member) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot); - - if (prop_info) { - if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { - zend_verify_property_type_error(prop_info, Z_STR_P(member), value); - goto exit; - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot))) { + if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { + zend_verify_property_type_error(prop_info, Z_STR_P(member), value); + goto exit; } } zend_assign_to_variable(variable_ptr, value, IS_CV); - Z_TYPE_FLAGS_P(variable_ptr) |= IS_TYPE_VERIFIED; /* we can also assign this to untyped properties in order to avoid a ce fetch upon reading */ goto exit; } } @@ -809,6 +815,13 @@ write_std_property: } if (EXPECTED(property_offset != ZEND_DYNAMIC_PROPERTY_OFFSET)) { + zend_property_info *prop_info; + if (cache_slot ? UNEXPECTED(prop_info = (zend_property_info *) CACHED_PTR_EX(cache_slot + 2)) : UNEXPECTED(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), NULL))) { + if (!zend_verify_property_type(prop_info, value, ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data)))) { + zend_verify_property_type_error(prop_info, Z_STR_P(member), value); + goto exit; + } + } ZVAL_COPY_VALUE(OBJ_PROP(zobj, property_offset), value); } else { if (!zobj->properties) { diff --git a/Zend/zend_types.h b/Zend/zend_types.h index 81ca927..45c2ebd 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -395,7 +395,6 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) { #define IS_TYPE_REFCOUNTED (1<<2) #define IS_TYPE_COLLECTABLE (1<<3) #define IS_TYPE_COPYABLE (1<<4) -#define IS_TYPE_VERIFIED (1<<5) /* extended types */ #define IS_INTERNED_STRING_EX IS_STRING @@ -472,9 +471,6 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) { #define Z_IMMUTABLE(zval) ((Z_TYPE_FLAGS(zval) & IS_TYPE_IMMUTABLE) != 0) #define Z_IMMUTABLE_P(zval_p) Z_IMMUTABLE(*(zval_p)) -#define Z_VERIFIED(zval) ((Z_TYPE_FLAGS(zval) & IS_TYPE_VERIFIED) != 0) -#define Z_VERIFIED_P(zval_p) Z_VERIFIED(*(zval_p)) - /* the following Z_OPT_* macros make better code when Z_TYPE_INFO accessed before */ #define Z_OPT_TYPE(zval) (Z_TYPE_INFO(zval) & Z_TYPE_MASK) #define Z_OPT_TYPE_P(zval_p) Z_OPT_TYPE(*(zval_p)) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index b7d2bd9..431b1fd 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1944,24 +1944,6 @@ ZEND_VM_C_LABEL(fetch_obj_r_no_object): } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - ZEND_VM_C_LABEL(fetch_obj_r_exit): FREE_OP2(); FREE_OP1(); @@ -1974,6 +1956,7 @@ ZEND_VM_HANDLER(85, ZEND_FETCH_OBJ_W, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV) zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = GET_OP2_ZVAL_PTR(BP_VAR_R); @@ -1987,17 +1970,13 @@ ZEND_VM_HANDLER(85, ZEND_FETCH_OBJ_W, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV) zend_fetch_property_address(EX_VAR(opline->result.var), container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((OP2_TYPE != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -2015,6 +1994,7 @@ ZEND_VM_HANDLER(88, ZEND_FETCH_OBJ_RW, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV) zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = GET_OP2_ZVAL_PTR(BP_VAR_R); @@ -2026,21 +2006,18 @@ ZEND_VM_HANDLER(88, ZEND_FETCH_OBJ_RW, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV) HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); FREE_OP2(); if (OP1_TYPE == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -2131,6 +2108,7 @@ ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, CONST|TMP|VAR|UNUSED|THIS|CV, CONST /* Behave like FETCH_OBJ_W */ zend_free_op free_op1, free_op2; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = GET_OP2_ZVAL_PTR(BP_VAR_R); @@ -2147,20 +2125,17 @@ ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, CONST|TMP|VAR|UNUSED|THIS|CV, CONST FREE_OP1_VAR_PTR(); HANDLE_EXCEPTION(); } - - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } - } - zend_fetch_property_address(EX_VAR(opline->result.var), container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); + + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); + } + FREE_OP2(); if (OP1_TYPE == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -2292,13 +2267,12 @@ ZEND_VM_C_LABEL(fast_assign_obj): zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (OP_DATA_TYPE == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, OP_DATA_TYPE); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -6152,24 +6126,6 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH_R, VAR, ANY, JMP_ADDR) p++; } - if (UNEXPECTED(p->key && !Z_VERIFIED_P(value) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(array)))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(array, p->key, NULL); - - if (UNEXPECTED(prop_info)) { - if (UNEXPECTED(Z_TYPE_P(value) == IS_NULL)) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - ZSTR_VAL(p->key)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, p->key, value); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(value) |= IS_TYPE_VERIFIED; - } - if (opline->result_type & (IS_TMP_VAR|IS_CV)) { if (UNEXPECTED(!p->key)) { ZVAL_LONG(EX_VAR(opline->result.var), p->h); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 4b511cf..6375301 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -4995,24 +4995,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: @@ -5100,6 +5082,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -5117,20 +5100,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_CONST == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -8848,24 +8827,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: @@ -8953,6 +8914,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -8970,20 +8932,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_CONST == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -10787,24 +10745,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op2); @@ -10893,6 +10833,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ /* Behave like FETCH_OBJ_W */ zend_free_op free_op1, free_op2; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -10910,19 +10851,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); zval_ptr_dtor_nogc(free_op2); if (IS_CONST == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -13298,24 +13236,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op1); @@ -13331,6 +13251,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CO /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -13348,20 +13269,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CO HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_TMP_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -14550,24 +14467,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op1); @@ -14583,6 +14482,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -14600,20 +14500,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_TMP_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -15105,24 +15001,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); @@ -15138,6 +15016,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TM /* Behave like FETCH_OBJ_W */ zend_free_op free_op1, free_op2; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -15155,19 +15034,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TM HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); zval_ptr_dtor_nogc(free_op2); if (IS_TMP_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -16601,24 +16477,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_FETCH_R_SPEC_VAR_HANDLER(ZE p++; } - if (UNEXPECTED(p->key && !Z_VERIFIED_P(value) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(array)))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(array, p->key, NULL); - - if (UNEXPECTED(prop_info)) { - if (UNEXPECTED(Z_TYPE_P(value) == IS_NULL)) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - ZSTR_VAL(p->key)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, value, EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, p->key, value); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(value) |= IS_TYPE_VERIFIED; - } - if (opline->result_type & (IS_TMP_VAR|IS_CV)) { if (UNEXPECTED(!p->key)) { ZVAL_LONG(EX_VAR(opline->result.var), p->h); @@ -18422,24 +18280,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op1); @@ -18452,6 +18292,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_CONST_HAN zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -18465,17 +18306,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_CONST_HAN zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((IS_CONST != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -18492,6 +18329,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_CONST_HA zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -18503,22 +18341,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_CONST_HA HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -18535,6 +18369,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CO /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -18552,20 +18387,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CO HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -18683,13 +18514,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -18881,13 +18711,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -19079,13 +18908,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -19277,13 +19105,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -23612,24 +23439,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op1); @@ -23642,6 +23451,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_CV_HANDLE zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -23655,17 +23465,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_CV_HANDLE zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((IS_CV != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -23682,6 +23488,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_CV_HANDL zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -23693,22 +23500,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_CV_HANDL HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -23725,6 +23528,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -23742,20 +23546,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -23873,13 +23673,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -24071,13 +23870,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -24269,13 +24067,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -24467,13 +24264,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -26905,24 +26701,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); @@ -26935,6 +26713,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_TMPVAR_HA zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -26948,17 +26727,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_TMPVAR_HA zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (((IS_TMP_VAR|IS_VAR) != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -26976,6 +26751,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_TMPVAR_H zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -26987,21 +26763,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_TMPVAR_H HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); zval_ptr_dtor_nogc(free_op2); if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -27019,6 +26792,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TM /* Behave like FETCH_OBJ_W */ zend_free_op free_op1, free_op2; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -27036,19 +26810,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TM HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); zval_ptr_dtor_nogc(free_op2); if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -27167,13 +26938,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -27365,13 +27135,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -27563,13 +27332,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -27761,13 +27529,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -29760,24 +29527,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: @@ -29790,6 +29539,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_CONST_ zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -29803,17 +29553,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_CONST_ zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((IS_CONST != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -29830,6 +29576,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CONST zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -29841,22 +29588,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CONST HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -29945,6 +29688,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -29962,20 +29706,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -30093,13 +29833,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -30291,13 +30030,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -30489,13 +30227,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -30687,13 +30424,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -33591,24 +33327,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: @@ -33621,6 +33339,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_CV_HAN zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -33634,17 +33353,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_CV_HAN zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((IS_CV != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -33661,6 +33376,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CV_HA zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -33672,22 +33388,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CV_HA HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -33776,6 +33488,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -33793,20 +33506,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -33924,13 +33633,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -34122,13 +33830,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -34320,13 +34027,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -34518,13 +34224,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -36308,24 +36013,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op2); @@ -36338,6 +36025,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_TMPVAR zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -36351,17 +36039,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_TMPVAR zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (((IS_TMP_VAR|IS_VAR) != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -36379,6 +36063,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_TMPVA zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -36390,21 +36075,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_TMPVA HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); zval_ptr_dtor_nogc(free_op2); if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -36495,6 +36177,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED /* Behave like FETCH_OBJ_W */ zend_free_op free_op1, free_op2; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -36512,19 +36195,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); zval_ptr_dtor_nogc(free_op2); if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -36643,13 +36323,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -36841,13 +36520,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -37039,13 +36717,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -37237,13 +36914,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -41828,24 +41504,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: @@ -41858,6 +41516,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_CONST_HAND zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -41871,17 +41530,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_CONST_HAND zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((IS_CONST != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -41898,6 +41553,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_CONST_HAN zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -41909,22 +41565,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_CONST_HAN HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -42013,6 +41665,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CON /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = EX_CONSTANT(opline->op2); @@ -42030,20 +41683,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CON HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -42174,13 +41823,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -42372,13 +42020,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -42570,13 +42217,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -42768,13 +42414,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -49065,24 +48710,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: @@ -49095,6 +48722,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_CV_HANDLER zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -49108,17 +48736,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_CV_HANDLER zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if ((IS_CV != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -49135,6 +48759,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_CV_HANDLE zend_free_op free_op1; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -49146,22 +48771,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_CV_HANDLE HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -49250,6 +48871,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_ /* Behave like FETCH_OBJ_W */ zend_free_op free_op1; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); @@ -49267,20 +48889,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_ HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); } @@ -49411,13 +49029,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -49609,13 +49226,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -49807,13 +49423,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -50005,13 +49620,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -53431,24 +53045,6 @@ fetch_obj_r_no_object: } } while (0); - if (UNEXPECTED(!Z_VERIFIED_P(EX_VAR(opline->result.var)) && ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(container))) && EXPECTED(Z_TYPE_P(offset) == IS_STRING)) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, offset, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(offset)) : NULL)); - - if (prop_info) { - if (Z_TYPE_P(EX_VAR(opline->result.var)) == IS_NULL) { - zend_throw_exception_ex(zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be accessed before initialization", - ZSTR_VAL(prop_info->ce->name), - Z_STRVAL_P(offset)); - HANDLE_EXCEPTION(); - } else if (!zend_verify_property_type(prop_info, EX_VAR(opline->result.var), EX_USES_STRICT_TYPES())) { - zend_verify_property_type_error(prop_info, Z_STR_P(offset), EX_VAR(opline->result.var)); - HANDLE_EXCEPTION(); - } - } - Z_TYPE_FLAGS_P(EX_VAR(opline->result.var)) |= IS_TYPE_VERIFIED; - } - fetch_obj_r_exit: zval_ptr_dtor_nogc(free_op2); @@ -53461,6 +53057,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_TMPVAR_HAN zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -53474,17 +53071,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_TMPVAR_HAN zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (((IS_TMP_VAR|IS_VAR) != IS_CONST || UNEXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(property) + 2 * sizeof(void *)) != NULL)) && UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); - - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } @@ -53502,6 +53095,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_TMPVAR_HA zend_free_op free_op1, free_op2; zval *property; zval *container; + zend_property_info *prop_info SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -53513,21 +53107,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_TMPVAR_HA HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); - if (UNEXPECTED(prop_info)) { - if (zend_vm_is_fetching_reference(opline)) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be referenced", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + if (zend_vm_is_fetching_reference(opline)) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be referenced", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_RW); zval_ptr_dtor_nogc(free_op2); if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -53618,6 +53209,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP /* Behave like FETCH_OBJ_W */ zend_free_op free_op1, free_op2; zval *property; + zend_property_info *prop_info; SAVE_OPLINE(); property = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); @@ -53635,19 +53227,16 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP HANDLE_EXCEPTION(); } - if (UNEXPECTED(ZEND_OBJECT_HAS_TYPE_HINTS(container))) { - zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)); + zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); - if (prop_info) { - zend_throw_exception_ex( - zend_ce_type_error, prop_info->type, - "Typed property %s::$%s must not be passed by reference", - ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); - HANDLE_EXCEPTION(); - } + if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL)))) { + zend_throw_exception_ex( + zend_ce_type_error, prop_info->type, + "Typed property %s::$%s must not be passed by reference", + ZSTR_VAL(prop_info->ce->name), Z_STRVAL_P(property)); + HANDLE_EXCEPTION(); } - zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); zval_ptr_dtor_nogc(free_op2); if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var)); @@ -53779,13 +53368,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CONST == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CONST); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -53977,13 +53565,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_TMP_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -54175,13 +53762,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_VAR == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_VAR); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } @@ -54373,13 +53959,12 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } - /* will remain valid */ + /* will remain valid, thus no need to check prop_info in future here */ if (IS_CV == IS_CONST) { CACHE_PTR_EX(cache_slot + 2, NULL); } } value = zend_assign_to_variable(property, value, IS_CV); - Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; if (UNEXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), value); } diff --git a/ext/standard/var.c b/ext/standard/var.c index 9c55bd4..3041ca0 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -72,12 +72,17 @@ static void php_object_property_dump(zend_property_info *prop_info, zval *zv, ze ZEND_PUTS("]=>\n"); } - if (prop_info && Z_TYPE_P(zv) == IS_NULL) { - php_printf("%*cuninitialized(%s)\n", - level + 1, ' ', - (prop_info->type == IS_OBJECT) ? - ZSTR_VAL(prop_info->type_name) : - zend_get_type_by_const(prop_info->type)); + if (prop_info && Z_TYPE_P(zv) == IS_UNDEF) { + if (prop_info->type) { + php_printf("%*cuninitialized(%s)\n", + level + 1, ' ', + (prop_info->type == IS_OBJECT) ? + ZSTR_VAL(prop_info->type_name) : + zend_get_type_by_const(prop_info->type)); + } else { + php_printf("%*cuninitialized\n", + level + 1, ' '); + } } else { php_var_dump(zv, level + 2); } @@ -164,10 +169,14 @@ again: zend_string *key; zval *val; - ZEND_HASH_FOREACH_KEY_VAL_IND(myht, num, key, val) { + ZEND_HASH_FOREACH_KEY_VAL(myht, num, key, val) { zend_property_info *prop_info = NULL; - if (ZEND_OBJECT_HAS_TYPE_HINTS(struc)) { + if (Z_TYPE_P(val) == IS_INDIRECT) { + val = Z_INDIRECT_P(val); + } + + if (key) { prop_info = zend_object_fetch_property_type_info_ex(struc, key, NULL); } @@ -235,7 +244,7 @@ static void zval_array_element_dump(zval *zv, zend_ulong index, zend_string *key } /* }}} */ -static void zval_object_property_dump(zval *zv, zend_ulong index, zend_string *key, int level) /* {{{ */ +static void zval_object_property_dump(zend_property_info *prop_info, zval *zv, zend_ulong index, zend_string *key, int level) /* {{{ */ { const char *prop_name, *class_name; @@ -256,7 +265,20 @@ static void zval_object_property_dump(zval *zv, zend_ulong index, zend_string *k } ZEND_PUTS("]=>\n"); } - php_debug_zval_dump(zv, level + 2); + if (prop_info && Z_TYPE_P(zv) == IS_UNDEF) { + if (prop_info->type) { + php_printf("%*cuninitialized(%s)\n", + level + 1, ' ', + (prop_info->type == IS_OBJECT) ? + ZSTR_VAL(prop_info->type_name) : + zend_get_type_by_const(prop_info->type)); + } else { + php_printf("%*cuninitialized\n", + level + 1, ' '); + } + } else { + php_debug_zval_dump(zv, level + 2); + } } /* }}} */ @@ -335,8 +357,18 @@ again: php_printf("%sobject(%s)#%d (%d) refcount(%u){\n", COMMON, ZSTR_VAL(class_name), Z_OBJ_HANDLE_P(struc), myht ? zend_array_count(myht) : 0, Z_REFCOUNT_P(struc)); zend_string_release(class_name); if (myht) { - ZEND_HASH_FOREACH_KEY_VAL_IND(myht, index, key, val) { - zval_object_property_dump(val, index, key, level); + ZEND_HASH_FOREACH_KEY_VAL(myht, index, key, val) { + zend_property_info *prop_info = NULL; + + if (Z_TYPE_P(val) == IS_INDIRECT) { + val = Z_INDIRECT_P(val); + } + + if (key) { + prop_info = zend_object_fetch_property_type_info_ex(struc, key, NULL); + } + + zval_object_property_dump(prop_info, val, index, key, level); } ZEND_HASH_FOREACH_END(); myht->u.v.nApplyCount--; if (is_temp) {