From 4935c032762c376c19308b7cdf1b77780f1b073a Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 27 May 2016 10:53:32 -0700 Subject: [PATCH] Revert "assert won't cause indrect var access if it's disabled" in the other hand, it should not be there if it's disabled... This reverts commit 27f40676e6f506f353ad8d679dd9b21aa87b828e. --- ext/opcache/Optimizer/zend_cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/opcache/Optimizer/zend_cfg.c b/ext/opcache/Optimizer/zend_cfg.c index a4403a0e4db..9701f586067 100644 --- a/ext/opcache/Optimizer/zend_cfg.c +++ b/ext/opcache/Optimizer/zend_cfg.c @@ -331,7 +331,7 @@ int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t b flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS; } else if (zend_string_equals_literal(Z_STR_P(zv), "get_defined_vars")) { flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS; - } else if (EG(assertions) >= 0 && zend_string_equals_literal(Z_STR_P(zv), "assert")) { + } else if (zend_string_equals_literal(Z_STR_P(zv), "assert")) { flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS; } else if (zend_string_equals_literal(Z_STR_P(zv), "func_num_args")) { flags |= ZEND_FUNC_VARARG;