diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-04-09 15:52:37 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-04-09 15:52:37 +0200 |
| commit | 75b83ec2fd10eb6848d440d2a0e6da8d967c2827 (patch) | |
| tree | d8471c2a3e13b1e0e79e6cfaf6c0bd71555c87fc /Zend | |
| parent | 744c4a5592ab3e8a733d68fbfe8913081fb6c1bc (diff) | |
| download | php-git-75b83ec2fd10eb6848d440d2a0e6da8d967c2827.tar.gz | |
Add NEWS
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index a5ff72b668..b2f9bbdf50 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1563,7 +1563,7 @@ ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMPVAR|CV, UNUSED|CONST|V FREE_OP1(); HANDLE_EXCEPTION(); } - if (retval) { + if (EXPECTED(retval)) { if (OP1_TYPE == IS_CONST) { CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 7f2996387c..1fd6603713 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -5055,7 +5055,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ HANDLE_EXCEPTION(); } - if (retval) { + if (EXPECTED(retval)) { if (IS_CONST == IS_CONST) { CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval); } @@ -7023,7 +7023,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ HANDLE_EXCEPTION(); } - if (retval) { + if (EXPECTED(retval)) { if (IS_CONST == IS_CONST) { CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval); } @@ -7541,7 +7541,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ HANDLE_EXCEPTION(); } - if (retval) { + if (EXPECTED(retval)) { if (IS_CONST == IS_CONST) { CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval); } @@ -31473,7 +31473,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ HANDLE_EXCEPTION(); } - if (retval) { + if (EXPECTED(retval)) { if (IS_CV == IS_CONST) { CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval); } @@ -33713,7 +33713,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ HANDLE_EXCEPTION(); } - if (retval) { + if (EXPECTED(retval)) { if (IS_CV == IS_CONST) { CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval); } @@ -34673,7 +34673,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ HANDLE_EXCEPTION(); } - if (retval) { + if (EXPECTED(retval)) { if (IS_CV == IS_CONST) { CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval); } @@ -41946,7 +41946,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ zval_ptr_dtor_nogc(free_op1); HANDLE_EXCEPTION(); } - if (retval) { + if (EXPECTED(retval)) { if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval); } @@ -42961,7 +42961,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ zval_ptr_dtor_nogc(free_op1); HANDLE_EXCEPTION(); } - if (retval) { + if (EXPECTED(retval)) { if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval); } @@ -43384,7 +43384,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ zval_ptr_dtor_nogc(free_op1); HANDLE_EXCEPTION(); } - if (retval) { + if (EXPECTED(retval)) { if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval); } |