Separate zend_array_type_info() to avoid loop inlining

Author: dstogov

Zend/Optimizer/zend_inference.c

@@ -2024,6 +2024,34 @@ static void emit_type_narrowing_warning(const zend_op_array *op_array, zend_ssa
 	zend_error(E_WARNING, "Narrowing occurred during type inference of %s. Please file a bug report on bugs.php.net", def_op_name);
 }
 
+ZEND_API uint32_t ZEND_FASTCALL zend_array_type_info(const zval *zv)
+{
+	HashTable *ht = Z_ARRVAL_P(zv);
+	uint32_t tmp = MAY_BE_ARRAY;
+	zend_string *str;
+	zval *val;
+
+	if (Z_REFCOUNTED_P(zv)) {
+		tmp |= MAY_BE_RC1 | MAY_BE_RCN;
+	} else {
+		tmp |= MAY_BE_RCN;
+	}
+
+	ZEND_HASH_FOREACH_STR_KEY_VAL(ht, str, val) {
+		if (str) {
+			tmp |= MAY_BE_ARRAY_KEY_STRING;
+		} else {
+			tmp |= MAY_BE_ARRAY_KEY_LONG;
+		}
+		tmp |= 1 << (Z_TYPE_P(val) + MAY_BE_ARRAY_SHIFT);
+	} ZEND_HASH_FOREACH_END();
+	if (HT_IS_PACKED(ht)) {
+		tmp &= ~(MAY_BE_ARRAY_NUMERIC_HASH|MAY_BE_ARRAY_STRING_HASH);
+	}
+	return tmp;
+}
+
+
 ZEND_API uint32_t zend_array_element_type(uint32_t t1, zend_uchar op_type, int write, int insert)
 {
 	uint32_t tmp = 0;

Zend/Optimizer/zend_inference.h

@@ -152,33 +152,15 @@ DEFINE_SSA_OP_RANGE_OVERFLOW(op2)
 #define OP2_RANGE_UNDERFLOW() (_ssa_op2_range_underflow (op_array, ssa, opline, ssa_op))
 #define OP2_RANGE_OVERFLOW()  (_ssa_op2_range_overflow (op_array, ssa, opline, ssa_op))
 
+BEGIN_EXTERN_C()
+ZEND_API uint32_t ZEND_FASTCALL zend_array_type_info(const zval *zv);
+END_EXTERN_C()
+
 static zend_always_inline uint32_t _const_op_type(const zval *zv) {
 	if (Z_TYPE_P(zv) == IS_CONSTANT_AST) {
 		return MAY_BE_RC1 | MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY;
 	} else if (Z_TYPE_P(zv) == IS_ARRAY) {
-		HashTable *ht = Z_ARRVAL_P(zv);
-		uint32_t tmp = MAY_BE_ARRAY;
-		zend_string *str;
-		zval *val;
-
-		if (Z_REFCOUNTED_P(zv)) {
-			tmp |= MAY_BE_RC1 | MAY_BE_RCN;
-		} else {
-			tmp |= MAY_BE_RCN;
-		}
-
-		ZEND_HASH_FOREACH_STR_KEY_VAL(ht, str, val) {
-			if (str) {
-				tmp |= MAY_BE_ARRAY_KEY_STRING;
-			} else {
-				tmp |= MAY_BE_ARRAY_KEY_LONG;
-			}
-			tmp |= 1 << (Z_TYPE_P(val) + MAY_BE_ARRAY_SHIFT);
-		} ZEND_HASH_FOREACH_END();
-		if (HT_IS_PACKED(ht)) {
-			tmp &= ~(MAY_BE_ARRAY_NUMERIC_HASH|MAY_BE_ARRAY_STRING_HASH);
-		}
-		return tmp;
+		return zend_array_type_info(zv);
 	} else {
 		uint32_t tmp = (1 << Z_TYPE_P(zv));