From 2a3b75a0ebf4e711c8362ed91cbf505c75ec483c Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 9 Sep 2016 22:40:08 +0800 Subject: [PATCH] Fixed function info --- ext/opcache/Optimizer/zend_func_info.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c index 0097e30864..0e4e4441ea 100644 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@ -22,6 +22,7 @@ #include "zend_compile.h" #include "zend_extensions.h" #include "zend_ssa.h" +#include "zend_optimizer_internal.h" #include "zend_inference.h" #include "zend_call_graph.h" #include "zend_func_info.h" @@ -1212,7 +1213,9 @@ uint32_t zend_get_func_info(const zend_call_info *call_info, const zend_ssa *ssa func_info_t *info; if ((info = zend_hash_find_ptr(&func_info, Z_STR_P(CRT_CONSTANT_EX(call_info->caller_op_array, call_info->caller_init_opline->op2, ssa->rt_constants)))) != NULL) { - if (info->info_func) { + if (UNEXPECTED(zend_optimizer_is_disabled_func(info->name, info->name_len))) { + ret = MAY_BE_NULL; + } else if (info->info_func) { ret = info->info_func(call_info, ssa); } else { ret = info->info; -- 2.50.1