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

Merge branch 'PHP-7.4'

* PHP-7.4:
  Avoid reloading
---

1f38adb5016bad9327fc9abe0d5336852a89e0e3
diff --cc Zend/zend_vm_execute.h
index 511277969d,eb95d3bd44..bf58c0499b
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -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();
  }