Fixed compilation warnings

This commit is contained in:
Dmitry Stogov 2014-09-18 04:02:43 +04:00
parent 341ff0dea5
commit e646c6d5b5
3 changed files with 3 additions and 2 deletions

View File

@ -85,6 +85,7 @@ static zend_always_inline void* zend_arena_calloc(zend_arena **arena_ptr, size_t
size_t size;
void *ret;
(void)d;
ZEND_SIGNED_MULTIPLY_LONG(unit_size, count, size, d, overflow);
ZEND_ASSERT(overflow == 0);
ret = zend_arena_alloc(arena_ptr, size);

View File

@ -56,7 +56,7 @@ static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC
if (Z_REFCOUNTED_P(zval_ptr)) {
if (!Z_DELREF_P(zval_ptr)) {
ZEND_ASSERT(zval_ptr != &EG(uninitialized_zval));
_zval_dtor_func_for_ptr(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_CC);
_zval_dtor_func_for_ptr(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_RELAY_CC);
} else {
GC_ZVAL_CHECK_POSSIBLE_ROOT(zval_ptr);
}

View File

@ -39,7 +39,7 @@ static zend_always_inline void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC)
static zend_always_inline void _zval_ptr_dtor_nogc(zval *zval_ptr ZEND_FILE_LINE_DC)
{
if (Z_REFCOUNTED_P(zval_ptr) && !Z_DELREF_P(zval_ptr)) {
_zval_dtor_func_for_ptr(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_CC);
_zval_dtor_func_for_ptr(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_RELAY_CC);
}
}