From: Dmitry Stogov Date: Mon, 6 Jun 2016 22:01:48 +0000 (+0300) Subject: Fixed mixed declarations and code X-Git-Tag: php-7.1.0alpha1~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d324db717ca11128c1dc800a3936db1fda24dc3e;p=php Fixed mixed declarations and code --- diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index a1d1b0a71b..e70465fdc6 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -259,11 +259,10 @@ static zend_always_inline void zend_vm_stack_free_call_frame_ex(uint32_t call_in ZEND_ASSERT_VM_STACK_GLOBAL; if (UNEXPECTED(call_info & ZEND_CALL_ALLOCATED)) { - ZEND_ASSERT(call == (zend_execute_data*)ZEND_VM_STACK_ELEMENTS(EG(vm_stack))); - zend_vm_stack p = EG(vm_stack); zend_vm_stack prev = p->prev; + ZEND_ASSERT(call == (zend_execute_data*)ZEND_VM_STACK_ELEMENTS(EG(vm_stack))); EG(vm_stack_top) = prev->top; EG(vm_stack_end) = prev->end; EG(vm_stack) = prev;