Merge branch 'PHP-5.3' into PHP-5.4

diff --cc Zend/zend_vm_def.h
index eed65e3e27a6a0a0feb4a3a2d1d1a5d733b76006,d471f399e0076d24b3a45ea52403e4002f018b33..40e2e42e7d0fd9e163f0c539ec9072fb63c86ca6
--- 1/Zend/zend_vm_def.h
--- 2/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -2682,27 -2325,26 +2682,29 @@@ ZEND_VM_HELPER(zend_do_fcall_common_hel
                        }
  
                        if (!RETURN_VALUE_USED(opline)) {
 -                              zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
 +                              zval_ptr_dtor(&ret->var.ptr);
                        }
+               } else if (RETURN_VALUE_USED(opline)) {
+                       EX_T(opline->result.u.var).var.ptr = NULL;
                }
 -      } else if (EX(function_state).function->type == ZEND_USER_FUNCTION) {
 +      } else if (fbc->type == ZEND_USER_FUNCTION) {
                EX(original_return_value) = EG(return_value_ptr_ptr);
                EG(active_symbol_table) = NULL;
 -              EG(active_op_array) = &EX(function_state).function->op_array;
 +              EG(active_op_array) = &fbc->op_array;
                EG(return_value_ptr_ptr) = NULL;
 -              if (RETURN_VALUE_USED(opline)) {                        
 -                      EG(return_value_ptr_ptr) = &EX_T(opline->result.u.var).var.ptr;
 -                      EX_T(opline->result.u.var).var.ptr = NULL;
 -                      EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
 -                      EX_T(opline->result.u.var).var.fcall_returned_reference = EX(function_state).function->common.return_reference;
 +              if (RETURN_VALUE_USED(opline)) {
 +                      temp_variable *ret = &EX_T(opline->result.var);
 +
 +                      ret->var.ptr = NULL;
 +                      EG(return_value_ptr_ptr) = &ret->var.ptr;
 +                      ret->var.ptr_ptr = &ret->var.ptr;
 +                      ret->var.fcall_returned_reference = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0;
                }
  
 -              if (zend_execute == execute && !EG(exception)) {
 -                      EX(call_opline) = opline;
 -                      ZEND_VM_ENTER();
 +              if (EXPECTED(zend_execute == execute)) {
 +                      if (EXPECTED(EG(exception) == NULL)) {
 +                              ZEND_VM_ENTER();
 +                      }
                } else {
                        zend_execute(EG(active_op_array) TSRMLS_CC);
                }

diff --cc Zend/zend_vm_execute.h
index 18b3f4772c84aba1b9136cd6acd4e013dfef5fae,993b822aa7e3cf823f03a7854ac610cb9c0c1b28..ad6d70838145adcc366d1cbd7e87d870577b51ad
--- 1/Zend/zend_vm_execute.h
--- 2/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -646,27 -325,26 +646,29 @@@ static int ZEND_FASTCALL zend_do_fcall_
                        }
  
                        if (!RETURN_VALUE_USED(opline)) {
 -                              zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
 +                              zval_ptr_dtor(&ret->var.ptr);
                        }
+               } else if (RETURN_VALUE_USED(opline)) {
+                       EX_T(opline->result.u.var).var.ptr = NULL;
                }
 -      } else if (EX(function_state).function->type == ZEND_USER_FUNCTION) {
 +      } else if (fbc->type == ZEND_USER_FUNCTION) {
                EX(original_return_value) = EG(return_value_ptr_ptr);
                EG(active_symbol_table) = NULL;
 -              EG(active_op_array) = &EX(function_state).function->op_array;
 +              EG(active_op_array) = &fbc->op_array;
                EG(return_value_ptr_ptr) = NULL;
                if (RETURN_VALUE_USED(opline)) {
 -                      EG(return_value_ptr_ptr) = &EX_T(opline->result.u.var).var.ptr;
 -                      EX_T(opline->result.u.var).var.ptr = NULL;
 -                      EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
 -                      EX_T(opline->result.u.var).var.fcall_returned_reference = EX(function_state).function->common.return_reference;
 +                      temp_variable *ret = &EX_T(opline->result.var);
 +
 +                      ret->var.ptr = NULL;
 +                      EG(return_value_ptr_ptr) = &ret->var.ptr;
 +                      ret->var.ptr_ptr = &ret->var.ptr;
 +                      ret->var.fcall_returned_reference = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0;
                }
  
 -              if (zend_execute == execute && !EG(exception)) {
 -                      EX(call_opline) = opline;
 -                      ZEND_VM_ENTER();
 +              if (EXPECTED(zend_execute == execute)) {
 +                      if (EXPECTED(EG(exception) == NULL)) {
 +                              ZEND_VM_ENTER();
 +                      }
                } else {
                        zend_execute(EG(active_op_array) TSRMLS_CC);
                }