Merge branch 'PHP-7.4'

diff --cc Zend/zend_execute.c
index 1739fa700bce5c4eb2ea2e596d8cf6b1cd29796f,40a1c7362c279214bf0a9208af3835f70ece02a4..8c26dfc0bf58518f712eaf5a794463e19414977e
--- 1/Zend/zend_execute.c
--- 2/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);

diff --cc Zend/zend_vm_def.h
Simple merge

diff --cc Zend/zend_vm_execute.h
Simple merge