From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 22 Jan 2016 10:32:20 +0000 (+0300)
Subject: More accurate handling of isset() and unset()
X-Git-Tag: php-7.2.0alpha1~620^2~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b854ebab4ddd729a878b094268f639d2fa7b228;p=php

More accurate handling of isset() and unset()
---

diff --git a/ext/opcache/Optimizer/zend_cfg.c b/ext/opcache/Optimizer/zend_cfg.c
index b8121808d2..a7122319e7 100644
--- a/ext/opcache/Optimizer/zend_cfg.c
+++ b/ext/opcache/Optimizer/zend_cfg.c
@@ -366,7 +366,12 @@ int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t b
 				break;
 			case ZEND_UNSET_VAR:
 			case ZEND_ISSET_ISEMPTY_VAR:
-				if (!(opline->extended_value & ZEND_QUICK_SET)) {
+				if (((opline->extended_value & ZEND_FETCH_TYPE_MASK) == ZEND_FETCH_LOCAL) &&
+				    !(opline->extended_value & ZEND_QUICK_SET)) {
+					flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS;
+				} else if (((opline->extended_value & ZEND_FETCH_TYPE_MASK) == ZEND_FETCH_GLOBAL ||
+				            (opline->extended_value & ZEND_FETCH_TYPE_MASK) == ZEND_FETCH_GLOBAL_LOCK) &&
+				           !op_array->function_name) {
 					flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS;
 				}
 				break;