From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 30 Oct 2017 08:26:59 +0000 (+0800)
Subject: Use abbrev
X-Git-Tag: php-7.2.0RC6~17^2~4^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9de0f8683286f204facff774b87a99e2461f137;p=php

Use abbrev
---

diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
index d333947c66..1d142566ab 100644
--- a/ext/opcache/Optimizer/zend_inference.c
+++ b/ext/opcache/Optimizer/zend_inference.c
@@ -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 */