]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorDmitry Stogov <dmitry@zend.com>
Thu, 12 Sep 2019 15:53:26 +0000 (18:53 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 12 Sep 2019 15:53:26 +0000 (18:53 +0300)
* PHP-7.4:
  Load string once

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

index 58e4da1e27abd08ad96017a9578e1fece8f7434e,fa3940720cb870b13de2f57e7fd728e373bf53ee..884f1f58c8ba35dac2952913401a1c4b82162fd0
@@@ -7945,7 -7943,8 +7945,7 @@@ ZEND_VM_HANDLER(163, ZEND_FAST_RET, ANY
  ZEND_VM_HOT_HANDLER(168, ZEND_BIND_GLOBAL, CV, CONST, CACHE_SLOT)
  {
        USE_OPLINE
-       zval *varname;
 -      zend_free_op free_op1, free_op2;
+       zend_string *varname;
        zval *value;
        zval *variable_ptr;
        uintptr_t idx;
index dd1829b97b53b59bfd817487d13346360d3064b3,3c587611cdf879770207fc9d69f6d76a613782e7..9798a86bc3b52ff159a44c07f42e3ae0497dc78a
@@@ -42083,7 -41486,8 +42083,7 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BIND_GLOBAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
  {
        USE_OPLINE
-       zval *varname;
 -
+       zend_string *varname;
        zval *value;
        zval *variable_ptr;
        uintptr_t idx;