]> granicus.if.org Git - php/commitdiff
Revert "assert won't cause indrect var access if it's disabled"
authorXinchen Hui <laruence@gmail.com>
Fri, 27 May 2016 17:53:32 +0000 (10:53 -0700)
committerXinchen Hui <laruence@gmail.com>
Fri, 27 May 2016 17:53:32 +0000 (10:53 -0700)
in the other hand, it should not be there if it's disabled...

This reverts commit 27f40676e6f506f353ad8d679dd9b21aa87b828e.

ext/opcache/Optimizer/zend_cfg.c

index a4403a0e4db15c3c26eaf7e2186fbf2cc6bcbc67..9701f586067c2e39b12683efd8566f503fb94d45 100644 (file)
@@ -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;