Re: com php-src: Avoid overhead in RELEASE build.: Zend/zend_execute.h

From: Date: Mon, 22 Jun 2015 12:04:29 +0000
Subject: Re: com php-src: Avoid overhead in RELEASE build.: Zend/zend_execute.h
References: 1  Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87444@lists.php.net to get a copy of this message
On Mon, Jun 22, 2015 at 12:08 PM, Dmitry Stogov <dmitry@php.net> wrote: > Commit: 44d545b8e1c0bb48a969e5208b6002b2423e6bde > Author: Dmitry Stogov <dmitry@zend.com> Mon, 22 Jun 2015 > 13:08:33 +0300 > Parents: b97df475dfbfe5c7ddd883432eb3bcf3645803e9 > Branches: master > > Link: > > http://git.php.net/?p=php-src.git;a=commitdiff;h=44d545b8e1c0bb48a969e5208b6002b2423e6bde > > Log: > Avoid overhead in RELEASE build. > > Changed paths: > M Zend/zend_execute.h > > > Diff: > diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h > index 91100a9..0b54445 100644 > --- a/Zend/zend_execute.h > +++ b/Zend/zend_execute.h > @@ -148,8 +148,13 @@ struct _zend_vm_stack { > #define ZEND_VM_STACK_ELEMETS(stack) \ > (((zval*)(stack)) + ZEND_VM_STACK_HEADER_SLOTS) > > -#define ZEND_ASSERT_VM_STACK(stack) ZEND_ASSERT(stack->top > (zval *) > stack && stack->end > (zval *) stack && stack->top <= > stack->end) > -#define ZEND_ASSERT_VM_STACK_GLOBAL ZEND_ASSERT(EG(vm_stack_top) > (zval > *) EG(vm_stack) && EG(vm_stack_end) > (zval *) EG(vm_stack) && > EG(vm_stack_top) <= EG(vm_stack_end)) > +#if ZEND_DEBUG > +# define ZEND_ASSERT_VM_STACK(stack) ZEND_ASSERT(stack->top > (zval *) > stack && stack->end > (zval *) stack && stack->top <= > stack->end) > +# define ZEND_ASSERT_VM_STACK_GLOBAL ZEND_ASSERT(EG(vm_stack_top) > (zval > *) EG(vm_stack) && EG(vm_stack_end) > (zval *) EG(vm_stack) && > EG(vm_stack_top) <= EG(vm_stack_end)) > +#else > +# define ZEND_ASSERT_VM_STACK(stack) > +# define ZEND_ASSERT_VM_STACK_GLOBAL > +#endif > > ZEND_API void zend_vm_stack_init(void); > ZEND_API void zend_vm_stack_destroy(void); > > Could we maybe switch ZEND_ASSERT back to be only an assertion and use ZEND_ASSUME as assert(debug)+assume(release)? It would be nice if assertions can be used directly without having to wrap them in ZEND_DEBUG. Nikita

« previous php.cvs (#87444) next »