Address review comments

Clarify comment
Remove unnecessary variable
Use ZEND_TYPE_INIT_CLASS_CONST_MASK in zend_compile.c

Author: Girgias

Zend/zend_API.c

@@ -2784,17 +2784,13 @@ ZEND_API zend_result zend_register_functions(zend_class_entry *scope, const zend
 			num_args++;
 		}
 
-		bool rebuild_arginfo = false;
 		/* If types of arguments have to be checked */
 		if (reg_function->common.arg_info && num_args) {
 			uint32_t i;
 			for (i = 0; i < num_args; i++) {
 				zend_internal_arg_info *arg_info = &reg_function->internal_function.arg_info[i];
 				ZEND_ASSERT(arg_info->name && "Parameter must have a name");
 				if (ZEND_TYPE_IS_SET(arg_info->type)) {
-					if (ZEND_TYPE_IS_ITERABLE_FALLBACK(arg_info->type)) {
-						rebuild_arginfo = true;
-					}
 					reg_function->common.fn_flags |= ZEND_ACC_HAS_TYPE_HINTS;
 				}
 #if ZEND_DEBUG
@@ -2809,14 +2805,11 @@ ZEND_API zend_result zend_register_functions(zend_class_entry *scope, const zend
 			}
 		}
 
+		/* Rebuild arginfos if parameter/property types and/or a return type are used */
 		if (reg_function->common.arg_info &&
 			(reg_function->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) {
 			/* Treat return type as an extra argument */
 			num_args++;
-			rebuild_arginfo = true;
-		}
-
-		if (rebuild_arginfo) {
 			/* convert "const char*" class type names into "zend_string*" */
 			uint32_t i;
 			zend_arg_info *arg_info = reg_function->common.arg_info - 1;
@@ -2865,7 +2858,7 @@ ZEND_API zend_result zend_register_functions(zend_class_entry *scope, const zend
 					}
 				}
 				if (ZEND_TYPE_IS_ITERABLE_FALLBACK(new_arg_info[i].type)) {
-					/* Do not warn?
+					/* Warning generated an extension load warning which is emitted for every test
 					zend_error(E_CORE_WARNING, "iterable type is now a compile time alias for array|Traversable,"
 						" regenerate the argument info via the php-src gen_stub build script");
 					*/

Zend/zend_compile.c

@@ -6146,13 +6146,9 @@ static zend_type zend_compile_single_typename(zend_ast *ast)
 
 			/* Transform iterable into a type union alias */
 			if (type_code == IS_ITERABLE) {
-				zend_type iterable = (zend_type) ZEND_TYPE_INIT_CLASS(ZSTR_KNOWN(ZEND_STR_TRAVERSABLE), 0, 0);
-				ZEND_TYPE_FULL_MASK(iterable) |= MAY_BE_ARRAY;
-				// TODO Use this instead? ZEND_TYPE_INIT_CLASS_CONST_MASK(ZSTR_KNOWN(ZEND_STR_TRAVERSABLE), MAY_BE_ARRAY);
 				/* Set iterable bit for BC compat during Reflection and string representation of type */
-				ZEND_TYPE_FULL_MASK(iterable) |= _ZEND_TYPE_ITERABLE_BIT;
-				/* Inform that the type list is a union type */
-				ZEND_TYPE_FULL_MASK(iterable) |= _ZEND_TYPE_UNION_BIT;
+				zend_type iterable = (zend_type) ZEND_TYPE_INIT_CLASS_CONST_MASK(ZSTR_KNOWN(ZEND_STR_TRAVERSABLE),
+                	(_ZEND_TYPE_UNION_BIT|MAY_BE_ARRAY|_ZEND_TYPE_ITERABLE_BIT));
 				return iterable;
 			}