Fixed merge wrongly

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 40e2e42e7d0fd9e163f0c539ec9072fb63c86ca6..15cef7132f65b314e48ecab5084728a74fdace67 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2685,7 +2685,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
                                zval_ptr_dtor(&ret->var.ptr);
                        }
                } else if (RETURN_VALUE_USED(opline)) {
-                       EX_T(opline->result.u.var).var.ptr = NULL;
+                       EX_T(opline->result.var).var.ptr = NULL;
                }
        } else if (fbc->type == ZEND_USER_FUNCTION) {
                EX(original_return_value) = EG(return_value_ptr_ptr);

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index ad6d70838145adcc366d1cbd7e87d870577b51ad..4982cc213395e42b325e872515c845cb9f940cd7 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -649,7 +649,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR
                                zval_ptr_dtor(&ret->var.ptr);
                        }
                } else if (RETURN_VALUE_USED(opline)) {
-                       EX_T(opline->result.u.var).var.ptr = NULL;
+                       EX_T(opline->result.var).var.ptr = NULL;
                }
        } else if (fbc->type == ZEND_USER_FUNCTION) {
                EX(original_return_value) = EG(return_value_ptr_ptr);