summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2016-06-07 01:01:48 +0300
committerDmitry Stogov <dmitry@zend.com>2016-06-07 01:01:48 +0300
commitd324db717ca11128c1dc800a3936db1fda24dc3e (patch)
tree744937d24c97b036a5858c1e49a4f59983a00ab9
parent3c4edc8c62365d83ea62d4cdc550a6d3571aca4d (diff)
downloadphp-git-d324db717ca11128c1dc800a3936db1fda24dc3e.tar.gz
Fixed mixed declarations and code
-rw-r--r--Zend/zend_execute.h3
1 files changed, 1 insertions, 2 deletions
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;