diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-14 14:02:32 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-14 14:02:32 +0100 |
| commit | faaf510fa461ff4b7e21d744455cb585e0583ea8 (patch) | |
| tree | aeaed484c86af5d8e423a40f2c38dda51290caf5 /Zend/zend_execute.c | |
| parent | f15d89a5e477ec92ad24ac38fd37ea0004e529ff (diff) | |
| parent | adf2f39745e78fbb5e89802a2675b407d2ed5255 (diff) | |
| download | php-git-faaf510fa461ff4b7e21d744455cb585e0583ea8.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 1739fa700b..8c26dfc0bf 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2683,7 +2683,7 @@ static zend_never_inline zend_bool zend_handle_fetch_obj_flags( 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; @@ -2701,7 +2701,7 @@ static zend_always_inline void zend_fetch_property_address(zval *result, zval *c return; } - container = make_real_object(container, prop_ptr OPLINE_CC); + container = make_real_object(container, prop_ptr OPLINE_CC EXECUTE_DATA_CC); if (UNEXPECTED(!container)) { ZVAL_ERROR(result); return; |