From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 24 Jul 2019 18:53:19 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=957013c5b7a3d98f6a44b36cd296a0d095f36cc9;p=php

Merge branch 'PHP-7.4'
---

957013c5b7a3d98f6a44b36cd296a0d095f36cc9
diff --cc Zend/zend_execute.c
index 971899c9dd,a701442196..4c6984e73d
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@@ -425,7 -435,7 +425,7 @@@ static zend_always_inline zval *_get_op
  	}
  }
  
- static zend_always_inline zval *_get_zval_ptr_deref(int op_type, znode_op node, int type EXECUTE_DATA_DC OPLINE_DC)
 -static zend_always_inline ZEND_ATTRIBUTE_UNUSED zval *_get_zval_ptr_deref(int op_type, znode_op node, zend_free_op *should_free, int type EXECUTE_DATA_DC OPLINE_DC)
++static zend_always_inline ZEND_ATTRIBUTE_UNUSED zval *_get_zval_ptr_deref(int op_type, znode_op node, int type EXECUTE_DATA_DC OPLINE_DC)
  {
  	if (op_type & (IS_TMP_VAR|IS_VAR)) {
  		if (op_type == IS_TMP_VAR) {