From 9b854ebab4ddd729a878b094268f639d2fa7b228 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 22 Jan 2016 13:32:20 +0300 Subject: [PATCH] More accurate handling of isset() and unset() --- ext/opcache/Optimizer/zend_cfg.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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; -- 2.50.1