]> granicus.if.org Git - php/commitdiff
Use abbrev
authorXinchen Hui <laruence@gmail.com>
Mon, 30 Oct 2017 08:26:59 +0000 (16:26 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 30 Oct 2017 08:26:59 +0000 (16:26 +0800)
ext/opcache/Optimizer/zend_inference.c

index d333947c660215e8a0d64adf4c42bb8935e3692c..1d142566ab9e7d65c15892db0f3e59a3caead396 100644 (file)
@@ -3075,8 +3075,7 @@ static int zend_update_type_info(const zend_op_array *op_array,
                                        }
                                        j = zend_ssa_next_use(ssa_ops, ssa_ops[i].result_def, j);
                                }
-                               if ((tmp & MAY_BE_ARRAY)
-                                && (tmp & (MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING))) {
+                               if ((tmp & MAY_BE_ARRAY) && (tmp & MAY_BE_ARRAY_KEY_ANY)) {
                                        UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def);
                                } else {
                                        /* invalid key type */