com php-src: No need to do this check for master, ZEND_COMPIL E_NO_BUILTIN_STRLEN already cover it: ext/opcac he/Optimizer/pass1_5.c
| From: | Xinchen Hui | Date: | Wed, 24 Dec 2014 12:42:17 +0000 |
| Subject: | com php-src: No need to do this check for master, ZEND_COMPIL E_NO_BUILTIN_STRLEN already cover it: ext/opcac he/Optimizer/pass1_5.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83850@lists.php.net to get a copy of this message | ||
Commit: e0ca75a45494f4381159ce357cb7b0ebe5e1e312
Author: Xinchen Hui <laruence@php.net> Wed, 24 Dec 2014 20:42:17 +0800
Parents: f2c2acb9a9dec382c216ba401f82d0a7aaa71edc
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e0ca75a45494f4381159ce357cb7b0ebe5e1e312
Log:
No need to do this check for master, ZEND_COMPILE_NO_BUILTIN_STRLEN already cover it
Changed paths:
M ext/opcache/Optimizer/pass1_5.c
Diff:
diff --git a/ext/opcache/Optimizer/pass1_5.c b/ext/opcache/Optimizer/pass1_5.c
index 2a2e304..0ab8114 100644
--- a/ext/opcache/Optimizer/pass1_5.c
+++ b/ext/opcache/Optimizer/pass1_5.c
@@ -512,9 +512,6 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
}
}
} else if ((CG(compiler_options) & ZEND_COMPILE_NO_BUILTIN_STRLEN) == 0 &&
- (!zend_hash_str_exists(&module_registry, "mbstring",
sizeof("mbstring") - 1) ||
- zend_ini_long("mbstring.func_overload",
- sizeof("mbstring.func_overload") - 1, 0) < 2 /* MB_OVERLOAD_STRING */)
&&
Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("strlen") - 1 &&
!memcmp(Z_STRVAL(ZEND_OP2_LITERAL(init_opline)), "strlen",
sizeof("strlen") - 1)) {
zval t;