From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 12 Sep 2019 15:53:26 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b10fcd3e76ea7d814c163aa18c8ee96a5291cf3;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Load string once
---

8b10fcd3e76ea7d814c163aa18c8ee96a5291cf3
diff --cc Zend/zend_vm_def.h
index 58e4da1e27,fa3940720c..884f1f58c8
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -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;
diff --cc Zend/zend_vm_execute.h
index dd1829b97b,3c587611cd..9798a86bc3
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -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;