]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorDmitry Stogov <dmitry@zend.com>
Wed, 24 Jul 2019 15:40:03 +0000 (18:40 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 24 Jul 2019 15:40:03 +0000 (18:40 +0300)
* PHP-7.4:
  Delay dereference

1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index 94e9fc1bbb867b49d1cf4d24e91401430e89dd1e,2314681671ba22b8a41aef69f85dbf0e21925509..01336ea53a709b639a5d78988104e95fd9b650f9
@@@ -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);
index bf58c0499b028885b5c956e0833951cb473a30d3,ef539601295294ca8d2de5be480a7c4add050a0c..50829da98d5acba533d704be38360fc87532e567
@@@ -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);