Revert "Save one xor instr"

This reverts commit bd5c5d372916375981f76ed7800b2f4600acae05.

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index e03c7379eb0c7d333594b7fa836d0c32ad4f1d64..7490e577d793e9d64f1b951cb52924ef036eccb1 100644 (file)
--- 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 7ec95224443f37a9e3bb4c439bb64ad9873ee74e..e542fd538d904a8b37017c0558d87c4300b67350 100644 (file)
--- 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;