From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 14 Feb 2019 13:02:32 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=faaf510fa461ff4b7e21d744455cb585e0583ea8;p=php

Merge branch 'PHP-7.4'
---

faaf510fa461ff4b7e21d744455cb585e0583ea8
diff --cc Zend/zend_execute.c
index 1739fa700b,40a1c7362c..8c26dfc0bf
--- 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);