]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorDmitry Stogov <dmitry@zend.com>
Wed, 24 Jul 2019 14:38:42 +0000 (17:38 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 24 Jul 2019 14:38:42 +0000 (17:38 +0300)
* PHP-7.4:
  Avoid reloading

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

Simple merge
index 511277969d5d600f7119c693fb72020fb0fb1d35,eb95d3bd4466a8a6d532116d5f4a8f3c4917aae6..bf58c0499b028885b5c956e0833951cb473a30d3
@@@ -13083,9 -13214,11 +13085,11 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
        }
  
        SAVE_OPLINE();
-       bitwise_not_function(EX_VAR(opline->result.var),
-               _get_zval_ptr_var(opline->op1.var EXECUTE_DATA_CC));
+       if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
+               op1 = ZVAL_UNDEFINED_OP1();
+       }
+       bitwise_not_function(EX_VAR(opline->result.var), op1);
 -      zval_ptr_dtor_nogc(free_op1);
 +      zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
        ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
  }