Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit 9c136f10cdcd · 2020-09-17T10:13:53.000+02:00
* PHP-7.3:
  Fixed bug #80083
diff --git a/NEWS b/NEWS
@@ -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
@@ -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")) {
