com php-src: Merge branch 'PHP-7.4': Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend_vm_execute.h
| From: | Nikita Popov | Date: | Thu, 14 Feb 2019 13:02:32 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104637@lists.php.net to get a copy of this message | ||
Commit: faaf510fa461ff4b7e21d744455cb585e0583ea8
Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 14 Feb 2019 14:02:32 +0100
Parents: f15d89a5e477ec92ad24ac38fd37ea0004e529ff adf2f39745e78fbb5e89802a2675b407d2ed5255
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=faaf510fa461ff4b7e21d744455cb585e0583ea8
Log:
Merge branch 'PHP-7.4'
Changed paths:
MM Zend/zend_execute.c
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
Diff:
diff --cc Zend/zend_execute.c
index 1739fa7,40a1c73..8c26dfc
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@@ -2683,13 -2692,11 +2683,13 @@@ static zend_never_inline zend_bool zend
return 1;
}
- static zend_always_inline void zend_fetch_property_address(zval *result, zval *container, uint32_t
container_op_type, zval *prop_ptr, uint32_t prop_op_type, void **cache_slot, int type, uint32_t
flags, zend_bool init_undef OPLINE_DC)
+ static zend_always_inline void zend_fetch_property_address(zval *result, zval *container, uint32_t
container_op_type, zval *prop_ptr, uint32_t prop_op_type, void **cache_slot, int type, uint32_t
flags, zend_bool init_undef OPLINE_DC EXECUTE_DATA_DC)
{
zval *ptr;
+ zend_object *zobj;
+ zend_string *name, *tmp_name;
- if (container_op_type != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
+ if (container_op_type != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
do {
if (Z_ISREF_P(container) && Z_TYPE_P(Z_REFVAL_P(container)) == IS_OBJECT) {
container = Z_REFVAL_P(container);