diff options
| author | Xinchen Hui <laruence@php.net> | 2014-12-11 03:19:33 -0500 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-12-11 03:19:33 -0500 |
| commit | 634448e2de17af236357c4c6e9b2c4e6e324c22e (patch) | |
| tree | de449b5e56951fc4d2552c0cdc96b1934d85a91a | |
| parent | 882741639cce273cdb8730742dbba2c43361547c (diff) | |
| download | php-git-634448e2de17af236357c4c6e9b2c4e6e324c22e.tar.gz | |
Revert "Save one xor instr"
This reverts commit bd5c5d372916375981f76ed7800b2f4600acae05.
| -rw-r--r-- | Zend/zend_vm_def.h | 4 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index e03c7379eb..7490e577d7 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2848,7 +2848,7 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY) zend_vm_stack_free_call_frame(call TSRMLS_CC); } else { - zval *return_value; + zval *return_value = NULL; call->symbol_table = NULL; if (RETURN_VALUE_USED(opline)) { @@ -2856,8 +2856,6 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY) ZVAL_NULL(return_value); Z_VAR_FLAGS_P(return_value) = 0; - } else { - return_value = NULL; } call->prev_execute_data = execute_data; diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 7ec9522444..e542fd538d 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -590,7 +590,7 @@ static int ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) zend_vm_stack_free_call_frame(call TSRMLS_CC); } else { - zval *return_value; + zval *return_value = NULL; call->symbol_table = NULL; if (RETURN_VALUE_USED(opline)) { @@ -598,8 +598,6 @@ static int ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) ZVAL_NULL(return_value); Z_VAR_FLAGS_P(return_value) = 0; - } else { - return_value = NULL; } call->prev_execute_data = execute_data; |