com php-src: Fixed mixed declarations and code: Zend/zend_exe cute.h

From: Date: Mon, 06 Jun 2016 22:01:48 +0000
Subject: com php-src: Fixed mixed declarations and code: Zend/zend_exe cute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92335@lists.php.net to get a copy of this message
Commit: d324db717ca11128c1dc800a3936db1fda24dc3e Author: Dmitry Stogov <dmitry@zend.com> Tue, 7 Jun 2016 01:01:48 +0300 Parents: 3c4edc8c62365d83ea62d4cdc550a6d3571aca4d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d324db717ca11128c1dc800a3936db1fda24dc3e Log: Fixed mixed declarations and code Changed paths: M Zend/zend_execute.h Diff: diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index a1d1b0a..e70465f 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;

« previous php.cvs (#92335) next »