Removed deprecated flag

diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c
index eb8dd1eeffa77098c69a5d2b2236a4ee8c046c1e..46153bc2ce93e8294379b917dff896bda284ad5e 100644 (file)
--- a/ext/opcache/Optimizer/zend_func_info.c
+++ b/ext/opcache/Optimizer/zend_func_info.c
@@ -72,10 +72,6 @@ static uint32_t zend_strlen_info(const zend_call_info *call_info, const zend_ssa
                                /* warning, and returns NULL */
                                tmp |= FUNC_MAY_WARN | MAY_BE_NULL;
                        }
-                       if ((arg_info & MAY_BE_ANY) == MAY_BE_STRING) {
-                               /* TODO: strlen() may be overriden by mbstring */
-                               tmp |= FUNC_MAY_INLINE;
-                       }
                } else {
                        tmp |= MAY_BE_LONG | FUNC_MAY_WARN | MAY_BE_NULL;
                }
@@ -134,7 +130,7 @@ static uint32_t zend_is_type_info(const zend_call_info *call_info, const zend_ss
 {
        if (call_info->caller_init_opline->extended_value == (uint32_t)call_info->num_args &&
            call_info->num_args == 1) {
-               return MAY_BE_FALSE | MAY_BE_TRUE | FUNC_MAY_INLINE;
+               return MAY_BE_FALSE | MAY_BE_TRUE;
        } else {
                return MAY_BE_FALSE | MAY_BE_TRUE | FUNC_MAY_WARN;
        }

diff --git a/ext/opcache/Optimizer/zend_func_info.h b/ext/opcache/Optimizer/zend_func_info.h
index 8fcf00d26a3e10b6ec2d93af0fd5f5aa9ab1e8f9..13fae8ff0be64a1d7a1001b9df7922eb69fe59c4 100644 (file)
--- a/ext/opcache/Optimizer/zend_func_info.h
+++ b/ext/opcache/Optimizer/zend_func_info.h
@@ -35,7 +35,6 @@
  * returned by zend_get_func_info()
  */
 #define FUNC_MAY_WARN                      (1<<30)
-#define FUNC_MAY_INLINE                    (1<<31)
 
 typedef struct _zend_func_info zend_func_info;
 typedef struct _zend_call_info zend_call_info;

diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
index 366896e79b3533190c6f8f3fd5df5232d4b4b51b..fdff328dd7f8f9cf3c3bfc231a40bede77abecef 100644 (file)
--- a/ext/opcache/Optimizer/zend_inference.c
+++ b/ext/opcache/Optimizer/zend_inference.c
@@ -3423,7 +3423,7 @@ static void zend_update_type_info(const zend_op_array *op_array,
                                if (!call_info) {
                                        goto unknown_opcode;
                                }
-                               tmp = zend_get_func_info(call_info, ssa) & ~(FUNC_MAY_WARN|FUNC_MAY_INLINE);
+                               tmp = zend_get_func_info(call_info, ssa) & ~FUNC_MAY_WARN;
                                UPDATE_SSA_TYPE(tmp, ssa_ops[i].result_def);
                                if (call_info->callee_func->type == ZEND_USER_FUNCTION) {
                                        func_info = ZEND_FUNC_INFO(&call_info->callee_func->op_array);