From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 27 May 2016 17:53:32 +0000 (-0700)
Subject: Revert "assert won't cause indrect var access if it's disabled"
X-Git-Tag: php-7.1.0alpha1~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4935c032762c376c19308b7cdf1b77780f1b073a;p=php

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.
---

diff --git a/ext/opcache/Optimizer/zend_cfg.c b/ext/opcache/Optimizer/zend_cfg.c
index a4403a0e4d..9701f58606 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;