From e0ca75a45494f4381159ce357cb7b0ebe5e1e312 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 24 Dec 2014 20:42:17 +0800 Subject: [PATCH] No need to do this check for master, ZEND_COMPILE_NO_BUILTIN_STRLEN already cover it --- ext/opcache/Optimizer/pass1_5.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/ext/opcache/Optimizer/pass1_5.c b/ext/opcache/Optimizer/pass1_5.c index 2a2e304b55..0ab8114e41 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; -- 2.40.0