com php-src: Fixed Zend/tests/type_declarations/typed_prope rties_044.phpt (error message should be t he same independently of called function): Zend
/tests/type_declarations/typed_properties_010.php t Zend/tests/type_declarations/typed_properties_04 4.phpt Zend/zend_execute.c Zend/zend_vm_def.h
Zend/zend_vm_execute.h
| From: | Bob Weinand | Date: | Tue, 24 May 2016 12:49:45 +0000 |
| Subject: | com php-src: Fixed Zend/tests/type_declarations/typed_prope rties_044.phpt (error message should be t he same independently of called function): Zend /tests/type_declarations/typed_properties_010.php t Zend/tests/type_declarations/typed_properties_04 4.phpt Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend_vm_execute.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95536@lists.php.net to get a copy of this message | ||
Commit: 2ce08cab29b1f48ddbad9f46587a8640022d96eb
Author: Dmitry Stogov <dmitry@zend.com> Tue, 24 May 2016 15:49:45 +0300
Parents: 4b28b0db4bbc5296f278c7588e88acd313c083b3
Branches: typed_ref_properties
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2ce08cab29b1f48ddbad9f46587a8640022d96eb
Log:
Fixed Zend/tests/type_declarations/typed_properties_044.phpt (error message should be the same
independently of called function)
Changed paths:
M Zend/tests/type_declarations/typed_properties_010.phpt
M Zend/tests/type_declarations/typed_properties_044.phpt
M Zend/zend_execute.c
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
diff --git a/Zend/tests/type_declarations/typed_properties_010.phpt b/Zend/tests/type_declarations/typed_properties_010.phpt index b13d782..3ef8ece 100644 --- a/Zend/tests/type_declarations/typed_properties_010.phpt +++ b/Zend/tests/type_declarations/typed_properties_010.phpt @@ -14,7 +14,7 @@ $foo = new Foo(); $cb($foo->bar); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: Typed property Foo::$bar must not be passed by reference in %s:11 +Fatal error: Uncaught TypeError: Typed property Foo::$bar must not be referenced in %s:11 Stack trace: #0 {main} thrown in %s on line 11 diff --git a/Zend/tests/type_declarations/typed_properties_044.phpt b/Zend/tests/type_declarations/typed_properties_044.phpt index be64f74..3dc96e2 100644 --- a/Zend/tests/type_declarations/typed_properties_044.phpt +++ b/Zend/tests/type_declarations/typed_properties_044.phpt @@ -1,5 +1,5 @@ --TEST-- -Proper source duplication on assignment to typed property +Error message should be the same independently of called function --FILE-- <?php class Foo { diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 816fcc3..ac76625 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -178,32 +178,45 @@ ZEND_API void* zend_vm_stack_extend(size_t size) return ptr; } -zend_bool zend_vm_is_fetching_reference(const zend_op * opline) { +static zend_bool zend_vm_is_fetching_reference(const zend_op * opline) +{ zend_op const *next = opline + 1; -_zend_vm_is_fetching_reference: - switch (next->opcode) { - case ZEND_NOP: - case ZEND_TICKS: - case ZEND_EXT_STMT: - case ZEND_FETCH_DIM_W: - case ZEND_FETCH_W: - case ZEND_FETCH_OBJ_W: { - next++; - } goto _zend_vm_is_fetching_reference; - } - - switch (next->opcode) { - case ZEND_SEND_REF: - case ZEND_RETURN_BY_REF: - case ZEND_ASSIGN_REF: - case ZEND_INIT_ARRAY: - case ZEND_ADD_ARRAY_ELEMENT: - case ZEND_YIELD: { - return 1; - } break; + while (1) { + switch (next->opcode) { + case ZEND_NOP: + case ZEND_TICKS: + case ZEND_EXT_STMT: + case ZEND_FETCH_DIM_W: + case ZEND_FETCH_W: + case ZEND_FETCH_OBJ_W: + next++; + break; + case ZEND_SEND_REF: + case ZEND_RETURN_BY_REF: + case ZEND_ASSIGN_REF: + case ZEND_INIT_ARRAY: + case ZEND_ADD_ARRAY_ELEMENT: + case ZEND_YIELD: + return 1; + default: + return 0; + } } +} + +static zend_always_inline zend_bool zend_is_referenced_typed_property(zval *container, zval *property, void **cache_slot, const zend_op *opline, int check_opline) +{ + zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, cache_slot); + if (UNEXPECTED(prop_info) + && (!check_opline || UNEXPECTED(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)); + return 1; + } return 0; } diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index f98a847..97c36bb 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1953,7 +1953,6 @@ 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); @@ -1967,14 +1966,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + FREE_OP2(); + FREE_OP1_VAR_PTR(); + HANDLE_EXCEPTION(); } FREE_OP2(); @@ -1991,7 +1986,6 @@ 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); @@ -2004,14 +1998,10 @@ ZEND_VM_HANDLER(88, ZEND_FETCH_OBJ_RW, 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_RW); - 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + FREE_OP2(); + FREE_OP1_VAR_PTR(); + HANDLE_EXCEPTION(); } FREE_OP2(); @@ -2104,7 +2094,6 @@ 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); @@ -2124,11 +2113,9 @@ ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, CONST|TMP|VAR|UNUSED|THIS|CV, CONST 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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + FREE_OP2(); + FREE_OP1_VAR_PTR(); HANDLE_EXCEPTION(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 76ad23d..73c7c69 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -5079,7 +5079,6 @@ 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); @@ -5099,11 +5098,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -8908,7 +8905,6 @@ 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); @@ -8928,11 +8924,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -10825,7 +10819,6 @@ 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); @@ -10845,11 +10838,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); } @@ -13240,7 +13231,6 @@ 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); @@ -13260,11 +13250,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CO 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -14468,7 +14456,6 @@ 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); @@ -14488,11 +14475,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -15000,7 +14985,6 @@ 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); @@ -15020,11 +15004,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TM 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); } @@ -18271,7 +18253,6 @@ 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); @@ -18285,14 +18266,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -18308,7 +18285,6 @@ 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); @@ -18321,14 +18297,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_CONST_HA } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -18347,7 +18319,6 @@ 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); @@ -18367,11 +18338,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CO 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } @@ -23420,7 +23389,6 @@ 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); @@ -23434,14 +23402,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -23457,7 +23421,6 @@ 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); @@ -23470,14 +23433,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_CV_HANDL } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -23496,7 +23455,6 @@ 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); @@ -23516,11 +23474,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } @@ -26673,7 +26629,6 @@ 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); @@ -26687,14 +26642,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + zval_ptr_dtor_nogc(free_op2); + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + HANDLE_EXCEPTION(); } zval_ptr_dtor_nogc(free_op2); @@ -26711,7 +26662,6 @@ 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); @@ -26724,14 +26674,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_TMPVAR_H } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + zval_ptr_dtor_nogc(free_op2); + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + HANDLE_EXCEPTION(); } zval_ptr_dtor_nogc(free_op2); @@ -26751,7 +26697,6 @@ 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); @@ -26771,11 +26716,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TM 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + zval_ptr_dtor_nogc(free_op2); + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } @@ -29489,7 +29432,6 @@ 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); @@ -29503,14 +29445,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -29526,7 +29464,6 @@ 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); @@ -29539,14 +29476,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_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_RW); - 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -29637,7 +29570,6 @@ 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); @@ -29657,11 +29589,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -33279,7 +33209,6 @@ 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); @@ -33293,14 +33222,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -33316,7 +33241,6 @@ 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); @@ -33329,14 +33253,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CV_HA } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -33427,7 +33347,6 @@ 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); @@ -33447,11 +33366,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -35956,7 +35873,6 @@ 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); @@ -35970,14 +35886,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + zval_ptr_dtor_nogc(free_op2); + + HANDLE_EXCEPTION(); } zval_ptr_dtor_nogc(free_op2); @@ -35994,7 +35906,6 @@ 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); @@ -36007,14 +35918,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_TMPVA } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + zval_ptr_dtor_nogc(free_op2); + + HANDLE_EXCEPTION(); } zval_ptr_dtor_nogc(free_op2); @@ -36107,7 +36014,6 @@ 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); @@ -36127,11 +36033,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); } @@ -41437,7 +41341,6 @@ 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); @@ -41451,14 +41354,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -41474,7 +41373,6 @@ 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); @@ -41487,14 +41385,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_CONST_HAN } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -41585,7 +41479,6 @@ 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); @@ -41605,11 +41498,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CON 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -48633,7 +48524,6 @@ 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); @@ -48647,14 +48537,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -48670,7 +48556,6 @@ 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); @@ -48683,14 +48568,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_CV_HANDLE } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -48781,7 +48662,6 @@ 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); @@ -48801,11 +48681,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_ 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -52959,7 +52837,6 @@ 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); @@ -52973,14 +52850,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + zval_ptr_dtor_nogc(free_op2); + + HANDLE_EXCEPTION(); } zval_ptr_dtor_nogc(free_op2); @@ -52997,7 +52870,6 @@ 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); @@ -53010,14 +52882,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_TMPVAR_HA } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + zval_ptr_dtor_nogc(free_op2); + + HANDLE_EXCEPTION(); } zval_ptr_dtor_nogc(free_op2); @@ -53110,7 +52978,6 @@ 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); @@ -53130,11 +52997,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); }
diff --git a/Zend/tests/type_declarations/typed_properties_010.phpt b/Zend/tests/type_declarations/typed_properties_010.phpt index b13d782..3ef8ece 100644 --- a/Zend/tests/type_declarations/typed_properties_010.phpt +++ b/Zend/tests/type_declarations/typed_properties_010.phpt @@ -14,7 +14,7 @@ $foo = new Foo(); $cb($foo->bar); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: Typed property Foo::$bar must not be passed by reference in %s:11 +Fatal error: Uncaught TypeError: Typed property Foo::$bar must not be referenced in %s:11 Stack trace: #0 {main} thrown in %s on line 11 diff --git a/Zend/tests/type_declarations/typed_properties_044.phpt b/Zend/tests/type_declarations/typed_properties_044.phpt index be64f74..3dc96e2 100644 --- a/Zend/tests/type_declarations/typed_properties_044.phpt +++ b/Zend/tests/type_declarations/typed_properties_044.phpt @@ -1,5 +1,5 @@ --TEST-- -Proper source duplication on assignment to typed property +Error message should be the same independently of called function --FILE-- <?php class Foo { diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 816fcc3..ac76625 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -178,32 +178,45 @@ ZEND_API void* zend_vm_stack_extend(size_t size) return ptr; } -zend_bool zend_vm_is_fetching_reference(const zend_op * opline) { +static zend_bool zend_vm_is_fetching_reference(const zend_op * opline) +{ zend_op const *next = opline + 1; -_zend_vm_is_fetching_reference: - switch (next->opcode) { - case ZEND_NOP: - case ZEND_TICKS: - case ZEND_EXT_STMT: - case ZEND_FETCH_DIM_W: - case ZEND_FETCH_W: - case ZEND_FETCH_OBJ_W: { - next++; - } goto _zend_vm_is_fetching_reference; - } - - switch (next->opcode) { - case ZEND_SEND_REF: - case ZEND_RETURN_BY_REF: - case ZEND_ASSIGN_REF: - case ZEND_INIT_ARRAY: - case ZEND_ADD_ARRAY_ELEMENT: - case ZEND_YIELD: { - return 1; - } break; + while (1) { + switch (next->opcode) { + case ZEND_NOP: + case ZEND_TICKS: + case ZEND_EXT_STMT: + case ZEND_FETCH_DIM_W: + case ZEND_FETCH_W: + case ZEND_FETCH_OBJ_W: + next++; + break; + case ZEND_SEND_REF: + case ZEND_RETURN_BY_REF: + case ZEND_ASSIGN_REF: + case ZEND_INIT_ARRAY: + case ZEND_ADD_ARRAY_ELEMENT: + case ZEND_YIELD: + return 1; + default: + return 0; + } } +} + +static zend_always_inline zend_bool zend_is_referenced_typed_property(zval *container, zval *property, void **cache_slot, const zend_op *opline, int check_opline) +{ + zend_property_info *prop_info = zend_object_fetch_property_type_info(container, property, cache_slot); + if (UNEXPECTED(prop_info) + && (!check_opline || UNEXPECTED(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)); + return 1; + } return 0; } diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index f98a847..97c36bb 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1953,7 +1953,6 @@ 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); @@ -1967,14 +1966,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + FREE_OP2(); + FREE_OP1_VAR_PTR(); + HANDLE_EXCEPTION(); } FREE_OP2(); @@ -1991,7 +1986,6 @@ 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); @@ -2004,14 +1998,10 @@ ZEND_VM_HANDLER(88, ZEND_FETCH_OBJ_RW, 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_RW); - 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + FREE_OP2(); + FREE_OP1_VAR_PTR(); + HANDLE_EXCEPTION(); } FREE_OP2(); @@ -2104,7 +2094,6 @@ 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); @@ -2124,11 +2113,9 @@ ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, CONST|TMP|VAR|UNUSED|THIS|CV, CONST 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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + FREE_OP2(); + FREE_OP1_VAR_PTR(); HANDLE_EXCEPTION(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 76ad23d..73c7c69 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -5079,7 +5079,6 @@ 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); @@ -5099,11 +5098,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -8908,7 +8905,6 @@ 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); @@ -8928,11 +8924,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -10825,7 +10819,6 @@ 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); @@ -10845,11 +10838,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); } @@ -13240,7 +13231,6 @@ 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); @@ -13260,11 +13250,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CO 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -14468,7 +14456,6 @@ 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); @@ -14488,11 +14475,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -15000,7 +14985,6 @@ 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); @@ -15020,11 +15004,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TM 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); } @@ -18271,7 +18253,6 @@ 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); @@ -18285,14 +18266,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -18308,7 +18285,6 @@ 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); @@ -18321,14 +18297,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_CONST_HA } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -18347,7 +18319,6 @@ 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); @@ -18367,11 +18338,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CO 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } @@ -23420,7 +23389,6 @@ 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); @@ -23434,14 +23402,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -23457,7 +23421,6 @@ 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); @@ -23470,14 +23433,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_CV_HANDL } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -23496,7 +23455,6 @@ 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); @@ -23516,11 +23474,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } @@ -26673,7 +26629,6 @@ 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); @@ -26687,14 +26642,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + zval_ptr_dtor_nogc(free_op2); + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + HANDLE_EXCEPTION(); } zval_ptr_dtor_nogc(free_op2); @@ -26711,7 +26662,6 @@ 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); @@ -26724,14 +26674,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_VAR_TMPVAR_H } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + zval_ptr_dtor_nogc(free_op2); + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + HANDLE_EXCEPTION(); } zval_ptr_dtor_nogc(free_op2); @@ -26751,7 +26697,6 @@ 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); @@ -26771,11 +26716,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TM 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + zval_ptr_dtor_nogc(free_op2); + if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; HANDLE_EXCEPTION(); } @@ -29489,7 +29432,6 @@ 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); @@ -29503,14 +29445,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -29526,7 +29464,6 @@ 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); @@ -29539,14 +29476,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_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_RW); - 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -29637,7 +29570,6 @@ 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); @@ -29657,11 +29589,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -33279,7 +33209,6 @@ 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); @@ -33293,14 +33222,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -33316,7 +33241,6 @@ 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); @@ -33329,14 +33253,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CV_HA } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -33427,7 +33347,6 @@ 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); @@ -33447,11 +33366,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -35956,7 +35873,6 @@ 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); @@ -35970,14 +35886,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + zval_ptr_dtor_nogc(free_op2); + + HANDLE_EXCEPTION(); } zval_ptr_dtor_nogc(free_op2); @@ -35994,7 +35906,6 @@ 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); @@ -36007,14 +35918,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_UNUSED_TMPVA } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + zval_ptr_dtor_nogc(free_op2); + + HANDLE_EXCEPTION(); } zval_ptr_dtor_nogc(free_op2); @@ -36107,7 +36014,6 @@ 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); @@ -36127,11 +36033,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); } @@ -41437,7 +41341,6 @@ 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); @@ -41451,14 +41354,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -41474,7 +41373,6 @@ 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); @@ -41487,14 +41385,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_CONST_HAN } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -41585,7 +41479,6 @@ 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); @@ -41605,11 +41498,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CON 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -48633,7 +48524,6 @@ 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); @@ -48647,14 +48537,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -48670,7 +48556,6 @@ 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); @@ -48683,14 +48568,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_CV_HANDLE } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + + + HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && READY_TO_DESTROY(free_op1)) { @@ -48781,7 +48662,6 @@ 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); @@ -48801,11 +48681,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_ 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + + HANDLE_EXCEPTION(); } @@ -52959,7 +52837,6 @@ 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); @@ -52973,14 +52850,10 @@ 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 (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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + zval_ptr_dtor_nogc(free_op2); + + HANDLE_EXCEPTION(); } zval_ptr_dtor_nogc(free_op2); @@ -52997,7 +52870,6 @@ 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); @@ -53010,14 +52882,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_RW_SPEC_CV_TMPVAR_HA } 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 = 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(); - } + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 1))) { + zval_ptr_dtor_nogc(free_op2); + + HANDLE_EXCEPTION(); } zval_ptr_dtor_nogc(free_op2); @@ -53110,7 +52978,6 @@ 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); @@ -53130,11 +52997,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP 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 (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)); + if (UNEXPECTED(zend_is_referenced_typed_property(container, property, (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), opline, 0))) { + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); }