com php-src: Merge branch 'PHP-7.4': Zend/zend_API.c Zend /zend_API.h Zend/zend_closures.c Zend/zend_execut e.h Zend/zend_execute_API.c
Zend/zend_object_ha ndlers.c

From: Date: Wed, 29 May 2019 08:50:27 +0000
Subject: com php-src: Merge branch 'PHP-7.4': Zend/zend_API.c Zend /zend_API.h Zend/zend_closures.c Zend/zend_execut e.h Zend/zend_execute_API.c
Zend/zend_object_ha ndlers.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-106435@lists.php.net to get a copy of this message
Commit: 6d89553c481099d35a1001540bbdb32afd3281a2 Author: Dmitry Stogov <dmitry@zend.com> Wed, 29 May 2019 11:50:27 +0300 Parents: 1aa8d0e6808830958e6f7b63c1fb623227b34037 e14d77335c5827f1a0445141efd58440a1e65db7 Branches: master Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=6d89553c481099d35a1001540bbdb32afd3281a2 Log: Merge branch 'PHP-7.4' * PHP-7.4: Mark "cold" functions Changed paths: MM Zend/zend_API.c MM Zend/zend_API.h MM Zend/zend_closures.c MM Zend/zend_execute.h MM Zend/zend_execute_API.c MM Zend/zend_object_handlers.c Diff: diff --cc Zend/zend_closures.c index 6151ce0,e8688a6..0b0c7b8 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@@ -408,28 -412,28 +408,28 @@@ static zend_function *zend_closure_get_ } /* }}} */ - static zval *zend_closure_read_property(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv) /* {{{ */ -static ZEND_COLD zval *zend_closure_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv) /* {{{ */ ++static ZEND_COLD zval *zend_closure_read_property(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv) /* {{{ */ { ZEND_CLOSURE_PROPERTY_ERROR(); return &EG(uninitialized_zval); } /* }}} */ - static zval *zend_closure_write_property(zend_object *object, zend_string *member, zval *value, void **cache_slot) /* {{{ */ -static ZEND_COLD zval *zend_closure_write_property(zval *object, zval *member, zval *value, void **cache_slot) /* {{{ */ ++static ZEND_COLD zval *zend_closure_write_property(zend_object *object, zend_string *member, zval *value, void **cache_slot) /* {{{ */ { ZEND_CLOSURE_PROPERTY_ERROR(); return value; } /* }}} */ - static zval *zend_closure_get_property_ptr_ptr(zend_object *object, zend_string *member, int type, void **cache_slot) /* {{{ */ -static ZEND_COLD zval *zend_closure_get_property_ptr_ptr(zval *object, zval *member, int type, void **cache_slot) /* {{{ */ ++static ZEND_COLD zval *zend_closure_get_property_ptr_ptr(zend_object *object, zend_string *member, int type, void **cache_slot) /* {{{ */ { ZEND_CLOSURE_PROPERTY_ERROR(); return NULL; } /* }}} */ - static int zend_closure_has_property(zend_object *object, zend_string *member, int has_set_exists, void **cache_slot) /* {{{ */ -static ZEND_COLD int zend_closure_has_property(zval *object, zval *member, int has_set_exists, void **cache_slot) /* {{{ */ ++static ZEND_COLD int zend_closure_has_property(zend_object *object, zend_string *member, int has_set_exists, void **cache_slot) /* {{{ */ { if (has_set_exists != ZEND_PROPERTY_EXISTS) { ZEND_CLOSURE_PROPERTY_ERROR(); @@@ -438,7 -442,7 +438,7 @@@ } /* }}} */ - static void zend_closure_unset_property(zend_object *object, zend_string *member, void **cache_slot) /* {{{ */ -static ZEND_COLD void zend_closure_unset_property(zval *object, zval *member, void **cache_slot) /* {{{ */ ++static ZEND_COLD void zend_closure_unset_property(zend_object *object, zend_string *member, void **cache_slot) /* {{{ */ { ZEND_CLOSURE_PROPERTY_ERROR(); }

« previous php.cvs (#106435) next »