com php-src: Easy optimization: constant assignment to objects will always succeed after it succeeded at least once: Zend/zend_vm_def .h
Zend/zend_vm_execute.h
| From: | Bob Weinand | Date: | Mon, 23 May 2016 14:51:55 +0000 |
| Subject: | com php-src: Easy optimization: constant assignment to objects will always succeed after it succeeded at least once: Zend/zend_vm_def .h Zend/zend_vm_execute.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95554@lists.php.net to get a copy of this message | ||
Commit: 9282b8272e1303e8a241f8d3a9ba4d9f4dfaa177
Author: Bob Weinand <bobwei9@hotmail.com> Mon, 23 May 2016 16:51:55 +0200
Parents: 47003bdf6000c22a09afa12240009131202cdb06
Branches: typed_ref_properties
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9282b8272e1303e8a241f8d3a9ba4d9f4dfaa177
Log:
Easy optimization: constant assignment to objects will always succeed after it succeeded at least
once
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 4f77576..b7d2bd9 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2292,6 +2292,10 @@ ZEND_VM_C_LABEL(fast_assign_obj): zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (OP_DATA_TYPE == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, OP_DATA_TYPE); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 7d28e10..4b511cf 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -18683,6 +18683,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -18877,6 +18881,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -19071,6 +19079,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -19265,6 +19277,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -23857,6 +23873,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -24051,6 +24071,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -24245,6 +24269,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -24439,6 +24467,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -27135,6 +27167,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -27329,6 +27365,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -27523,6 +27563,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -27717,6 +27761,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -30045,6 +30093,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -30239,6 +30291,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -30433,6 +30489,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -30627,6 +30687,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -33860,6 +33924,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -34054,6 +34122,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -34248,6 +34320,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -34442,6 +34518,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -36563,6 +36643,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -36757,6 +36841,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -36951,6 +37039,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -37145,6 +37237,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -42078,6 +42174,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -42272,6 +42372,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -42466,6 +42570,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -42660,6 +42768,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -49299,6 +49411,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -49493,6 +49609,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -49687,6 +49807,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -49881,6 +50005,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -53651,6 +53779,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -53845,6 +53977,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -54039,6 +54175,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -54233,6 +54373,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED;
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 4f77576..b7d2bd9 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2292,6 +2292,10 @@ ZEND_VM_C_LABEL(fast_assign_obj): zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (OP_DATA_TYPE == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, OP_DATA_TYPE); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 7d28e10..4b511cf 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -18683,6 +18683,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -18877,6 +18881,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -19071,6 +19079,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -19265,6 +19277,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -23857,6 +23873,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -24051,6 +24071,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -24245,6 +24269,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -24439,6 +24467,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -27135,6 +27167,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -27329,6 +27365,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -27523,6 +27563,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -27717,6 +27761,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -30045,6 +30093,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -30239,6 +30291,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -30433,6 +30489,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -30627,6 +30687,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -33860,6 +33924,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -34054,6 +34122,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -34248,6 +34320,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -34442,6 +34518,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -36563,6 +36643,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -36757,6 +36841,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -36951,6 +37039,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -37145,6 +37237,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -42078,6 +42174,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -42272,6 +42372,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -42466,6 +42570,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -42660,6 +42768,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -49299,6 +49411,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -49493,6 +49609,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -49687,6 +49807,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -49881,6 +50005,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -53651,6 +53779,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CONST == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CONST); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -53845,6 +53977,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_TMP_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_TMP_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -54039,6 +54175,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_VAR == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_VAR); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED; @@ -54233,6 +54373,10 @@ fast_assign_obj: zend_verify_property_type_error(prop_info, Z_STR_P(property_name), value); HANDLE_EXCEPTION(); } + /* will remain valid */ + if (IS_CV == IS_CONST) { + CACHE_PTR_EX(cache_slot + 2, NULL); + } } value = zend_assign_to_variable(property, value, IS_CV); Z_TYPE_FLAGS_P(property) |= IS_TYPE_VERIFIED;