Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Removed recursive call
  Put ZEND_FASTCALL into the proper place.
This commit is contained in:
Xinchen Hui 2018-01-16 14:54:05 +08:00
commit ff6a9d1f10
2 changed files with 1 additions and 2 deletions

View File

@ -1061,7 +1061,6 @@ static void zend_generator_iterator_dtor(zend_object_iterator *iterator) /* {{{
zend_generator *generator = (zend_generator*)Z_OBJ(iterator->data);
generator->iterator = NULL;
zval_ptr_dtor(&iterator->data);
zend_iterator_dtor(iterator);
}
/* }}} */

View File

@ -44,7 +44,7 @@ static void ZEND_FASTCALL zend_ast_ref_destroy_wrapper(zend_ast_ref *ast ZEND_FI
# define zend_ast_ref_destroy_wrapper zend_ast_ref_destroy
#endif
typedef void ZEND_FASTCALL (*zend_zval_dtor_func_t)(zend_refcounted *p);
typedef void (ZEND_FASTCALL *zend_zval_dtor_func_t)(zend_refcounted *p);
static const zend_zval_dtor_func_t zend_zval_dtor_func[] = {
/* IS_UNDEF */ (zend_zval_dtor_func_t)zend_empty_destroy,