From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 12 Oct 2020 09:24:59 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a7f9afb9902c45218a0fff9112d34e05be7b61c;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Detect self-addition of array more accurately
  Deindirect source elements in zend_hash_merge
---

5a7f9afb9902c45218a0fff9112d34e05be7b61c
diff --cc Zend/zend_operators.c
index 08fc18f261,7338e471b6..596581270b
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@@ -920,21 -901,9 +920,21 @@@ try_again
  }
  /* }}} */
  
 +ZEND_API zend_string* ZEND_FASTCALL zval_get_string_func(zval *op) /* {{{ */
 +{
 +	return __zval_get_string_func(op, 0);
 +}
 +/* }}} */
 +
 +ZEND_API zend_string* ZEND_FASTCALL zval_try_get_string_func(zval *op) /* {{{ */
 +{
 +	return __zval_get_string_func(op, 1);
 +}
 +/* }}} */
 +
  static zend_never_inline void ZEND_FASTCALL add_function_array(zval *result, zval *op1, zval *op2) /* {{{ */
  {
- 	if ((result == op1) && (result == op2)) {
+ 	if (result == op1 && Z_ARR_P(op1) == Z_ARR_P(op2)) {
  		/* $a += $a */
  		return;
  	}