Grokbase Groups PHP php-cvs May 2016
FAQ
Commit: 4935c032762c376c19308b7cdf1b77780f1b073a
Author: Xinchen Hui <laruence@gmail.com> Fri, 27 May 2016 10:53:32 -0700
Parents: 27f40676e6f506f353ad8d679dd9b21aa87b828e
Branches: master

Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4935c032762c376c19308b7cdf1b77780f1b073a

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

Changed paths:
   M ext/opcache/Optimizer/zend_cfg.c


Diff:
diff --git a/ext/opcache/Optimizer/zend_cfg.c b/ext/opcache/Optimizer/zend_cfg.c
index a4403a0..9701f58 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;

Search Discussions

Related Discussions

Discussion Navigation
viewthread | post
posts ‹ prev | 1 of 1 | next ›
Discussion Overview
groupphp-cvs @
categoriesphp
postedMay 27, '16 at 5:54p
activeMay 27, '16 at 5:54p
posts1
users1
websitephp.net

1 user in discussion

Xinchen Hui: 1 post

People

Translate

site design / logo © 2019 Grokbase