diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 10:13:42 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 10:13:53 +0200 |
commit | 9c136f10cdcd222e8fc1d8f8bfd2a71a4893514c (patch) | |
tree | 3427a8f8a3981231438a4b115d5a315bf38d31ed | |
parent | 2bbf2a91aacd59d3511b5e22cac064d708140caa (diff) | |
parent | a4f806aa79c9d0e497866e86f750e87d9bd874f1 (diff) | |
download | php-git-9c136f10cdcd222e8fc1d8f8bfd2a71a4893514c.tar.gz |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #80083
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | ext/opcache/Optimizer/zend_optimizer.c | 2 |
2 files changed, 5 insertions, 0 deletions
@@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2020, PHP 7.4.12 +- OPcache: + . Fixed bug #80083 (Optimizer pass 6 removes variables used for ibm_db2 data + binding). (Nikita) 01 Oct 2020, PHP 7.4.11 diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index dda9e86e53..0349d0ffbe 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -906,6 +906,8 @@ uint32_t zend_optimizer_classify_function(zend_string *name, uint32_t num_args) return ZEND_FUNC_INDIRECT_VAR_ACCESS; } else if (zend_string_equals_literal(name, "assert")) { return ZEND_FUNC_INDIRECT_VAR_ACCESS; + } else if (zend_string_equals_literal(name, "db2_execute")) { + return ZEND_FUNC_INDIRECT_VAR_ACCESS; } else if (zend_string_equals_literal(name, "func_num_args")) { return ZEND_FUNC_VARARG; } else if (zend_string_equals_literal(name, "func_get_arg")) { |