summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-07-05 12:07:10 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-07-05 12:07:10 +0200
commite3c701ea38d93bfd74b9accfdaacc171ff453f4b (patch)
tree7196ed38c96c4d9ff1a040e99a9cc320c0533a79
parent920283ff2b02de4a8affc48c75e5481c381ca56e (diff)
parent5846e852831a01ab70b9350031924462302e1854 (diff)
downloadphp-git-e3c701ea38d93bfd74b9accfdaacc171ff453f4b.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
-rw-r--r--ext/opcache/Optimizer/zend_inference.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
index e37ab32681..961740bd5c 100644
--- a/ext/opcache/Optimizer/zend_inference.c
+++ b/ext/opcache/Optimizer/zend_inference.c
@@ -3270,6 +3270,7 @@ static int zend_update_type_info(const zend_op_array *op_array,
case ZEND_RETURN_BY_REF:
case ZEND_VERIFY_RETURN_TYPE:
case ZEND_MAKE_REF:
+ case ZEND_FE_RESET_RW:
tmp |= MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;
break;
case ZEND_PRE_INC: