Re: com php-src: Merge branch 'PHP-5.6': Zend/zend.c Zend/zend_compile.h Zend/zend_execute_API.c
| From: | Nikita Popov | Date: | Mon, 01 Sep 2014 21:17:31 +0000 |
| Subject: | Re: com php-src: Merge branch 'PHP-5.6': Zend/zend.c Zend/zend_compile.h Zend/zend_execute_API.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-81347@lists.php.net to get a copy of this message | ||
On Mon, Sep 1, 2014 at 9:22 PM, Stanislav Malyshev <stas@php.net> wrote:
> Commit: aaf5689f4d6e523fd78e0291dbbcd78f3ea988dc
> Author: Stanislav Malyshev <stas@php.net> Mon, 1 Sep 2014
> 12:22:41 -0700
> Parents: 481bf25b6ad70fcdc9c10f02b49c86a0bd4a3d0d
> 57f82819e978e34b3f488eb9a00681174584f5f3
> Branches: master
>
> Link:
>
> http://git.php.net/?p=php-src.git;a=commitdiff;h=aaf5689f4d6e523fd78e0291dbbcd78f3ea988dc
>
> Log:
> Merge branch 'PHP-5.6'
>
> * PHP-5.6:
> update NEWS
> Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
> Fix typo from commit 32314f6b6
> Fix destruction order in zend_shutdown (bug #65463, #66036)
>
> Conflicts:
> Zend/zend_compile.h
> Zend/zend_execute_API.c
>
> Bugs:
> https://bugs.php.net/65463
> https://bugs.php.net/66036
>
> Changed paths:
> MM Zend/zend.c
> MM Zend/zend_compile.h
> MM Zend/zend_execute_API.c
>
>
> Diff:
> diff --cc Zend/zend_compile.h
> index 71a622f,876e8ec..8888b6e
> --- a/Zend/zend_compile.h
> +++ b/Zend/zend_compile.h
> @@@ -487,17 -680,21 +487,21 @@@ ZEND_API int open_file_for_scanning(zen
> ZEND_API void init_op_array(zend_op_array *op_array, zend_uchar type,
> int initial_ops_size TSRMLS_DC);
> ZEND_API void destroy_op_array(zend_op_array *op_array TSRMLS_DC);
> ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle
> TSRMLS_DC);
> -ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC);
> -ZEND_API int zend_cleanup_user_class_data(zend_class_entry **pce
> TSRMLS_DC);
> +ZEND_API void zend_cleanup_user_class_data(zend_class_entry *ce
> TSRMLS_DC);
> ZEND_API void zend_cleanup_internal_class_data(zend_class_entry *ce
> TSRMLS_DC);
> ZEND_API void zend_cleanup_internal_classes(TSRMLS_D);
> +ZEND_API void zend_cleanup_op_array_data(zend_op_array *op_array);
> + ZEND_API int zend_cleanup_function_data(zend_function *function
> TSRMLS_DC);
> + ZEND_API int zend_cleanup_function_data_full(zend_function *function
> TSRMLS_DC);
> + ZEND_API int clean_non_persistent_function_full(zend_function *function
> TSRMLS_DC);
> + ZEND_API int clean_non_persistent_class_full(zend_class_entry **ce
> TSRMLS_DC);
>
> ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC);
> -ZEND_API void zend_function_dtor(zend_function *function);
> -ZEND_API void destroy_zend_class(zend_class_entry **pce);
> -void zend_class_add_ref(zend_class_entry **ce);
> +ZEND_API void zend_function_dtor(zval *zv);
> +ZEND_API void destroy_zend_class(zval *zv);
> +void zend_class_add_ref(zval *zv);
>
> -ZEND_API void zend_mangle_property_name(char **dest, int *dest_length,
> const char *src1, int src1_length, const char *src2, int src2_length, int
> internal);
> +ZEND_API zend_string *zend_mangle_property_name(const char *src1, int
> src1_length, const char *src2, int src2_length, int internal);
> #define zend_unmangle_property_name(mangled_property,
> mangled_property_len, class_name, prop_name) \
> zend_unmangle_property_name_ex(mangled_property,
> mangled_property_len, class_name, prop_name, NULL)
> ZEND_API int zend_unmangle_property_name_ex(const char
> *mangled_property, int mangled_property_len, const char **class_name, const
> char **prop_name, int *prop_len);
> diff --cc Zend/zend_execute_API.c
> index 5984e2d,243da3f..7842ecf
> --- a/Zend/zend_execute_API.c
> +++ b/Zend/zend_execute_API.c
> @@@ -110,9 -109,8 +110,9 @@@ static int clean_non_persistent_functio
> }
> /* }}} */
>
> - static int clean_non_persistent_function_full(zval *zv TSRMLS_DC) /* {{{
> */
> -ZEND_API int clean_non_persistent_function_full(zend_function *function
> TSRMLS_DC) /* {{{ */
> ++ZEND_API int clean_non_persistent_function_full(zval *zv TSRMLS_DC) /*
> {{{ */
> {
> + zend_function *function = Z_PTR_P(zv);
> return (function->type == ZEND_INTERNAL_FUNCTION) ?
> ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
> }
> /* }}} */
> @@@ -124,10 -121,9 +124,10 @@@ static int clean_non_persistent_class(z
> }
> /* }}} */
>
> - static int clean_non_persistent_class_full(zval *zv TSRMLS_DC) /* {{{ */
> -ZEND_API int clean_non_persistent_class_full(zend_class_entry **ce
> TSRMLS_DC) /* {{{ */
> ++ZEND_API int clean_non_persistent_class_full(zval *zv TSRMLS_DC) /* {{{
> */
> {
> - return ((*ce)->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_KEEP
> : ZEND_HASH_APPLY_REMOVE;
> + zend_class_entry *ce = Z_PTR_P(zv);
> + return (ce->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_KEEP :
> ZEND_HASH_APPLY_REMOVE;
> }
> /* }}} */
>
This breaks the master build. Incompatible signatures and usage of
non-existing functions.
Nikita