From: Xinchen Hui <laruence@php.net>
Date: Wed, 24 Dec 2014 12:42:17 +0000 (+0800)
Subject: No need to do this check for master, ZEND_COMPILE_NO_BUILTIN_STRLEN already cover it
X-Git-Tag: PRE_PHP7_REMOVALS~35^2~20^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0ca75a45494f4381159ce357cb7b0ebe5e1e312;p=php

No need to do this check for master, ZEND_COMPILE_NO_BUILTIN_STRLEN already cover it
---

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;