]> granicus.if.org Git - php/commitdiff
Fixed mixed declarations and code
authorDmitry Stogov <dmitry@zend.com>
Mon, 6 Jun 2016 22:01:48 +0000 (01:01 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 6 Jun 2016 22:01:48 +0000 (01:01 +0300)
Zend/zend_execute.h

index a1d1b0a71b070982c647e5d4e47c3976dbfde526..e70465fdc668664ed539edab640a2e9433b1a9b3 100644 (file)
@@ -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;