From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 24 Jul 2019 15:40:03 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a106e52b101856117bc72d0de87c99448ea5fdba;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Delay dereference
---

a106e52b101856117bc72d0de87c99448ea5fdba
diff --cc Zend/zend_vm_def.h
index 94e9fc1bbb,2314681671..01336ea53a
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -5084,7 -5100,8 +5084,7 @@@ ZEND_VM_HANDLER(119, ZEND_SEND_ARRAY, A
  ZEND_VM_C_LABEL(send_array):
  		ht = Z_ARRVAL_P(args);
  		if (OP2_TYPE != IS_UNUSED) {
- 			zval *op2 = GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R);
 -			zend_free_op free_op2;
+ 			zval *op2 = GET_OP2_ZVAL_PTR(BP_VAR_R);
  			uint32_t skip = opline->extended_value;
  			uint32_t count = zend_hash_num_elements(ht);
  			zend_long len = zval_get_long(op2);
diff --cc Zend/zend_vm_execute.h
index bf58c0499b,ef53960129..50829da98d
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -2015,7 -2042,8 +2015,7 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  send_array:
  		ht = Z_ARRVAL_P(args);
  		if (opline->op2_type != IS_UNUSED) {
- 			zval *op2 = get_zval_ptr_deref(opline->op2_type, opline->op2, BP_VAR_R);
 -			zend_free_op free_op2;
 -			zval *op2 = get_zval_ptr(opline->op2_type, opline->op2, &free_op2, BP_VAR_R);
++			zval *op2 = get_zval_ptr(opline->op2_type, opline->op2, BP_VAR_R);
  			uint32_t skip = opline->extended_value;
  			uint32_t count = zend_hash_num_elements(ht);
  			zend_long len = zval_get_long(op2);