Review

Author: arnaud-lb

Zend/zend_API.c

@@ -2953,7 +2953,7 @@ static zend_always_inline void zend_normalize_internal_type(zend_type *type) {
 	} ZEND_TYPE_FOREACH_END();
 }
 
-void zend_convert_internal_arg_info_type(zend_type *type)
+ZEND_API void zend_convert_internal_arg_info_type(zend_type *type)
 {
 	if (ZEND_TYPE_HAS_LITERAL_NAME(*type)) {
 		// gen_stubs.php does not support codegen for DNF types in arg infos.
@@ -2977,7 +2977,7 @@ void zend_convert_internal_arg_info_type(zend_type *type)
 			type->type_mask |= _ZEND_TYPE_NAME_BIT;
 		} else {
 			/* Union type */
-			zend_type_list *list = malloc(ZEND_TYPE_LIST_SIZE(num_types));
+			zend_type_list *list = pemalloc(ZEND_TYPE_LIST_SIZE(num_types), true);
 			list->num_types = num_types;
 			ZEND_TYPE_SET_LIST(*type, list);
 			ZEND_TYPE_FULL_MASK(*type) |= _ZEND_TYPE_UNION_BIT;
@@ -5332,7 +5332,7 @@ static zend_string *try_parse_string(const char *str, size_t len, char quote) {
 	return zend_string_init(str, len, 0);
 }
 
-ZEND_API zend_result zend_get_default_from_arg_info(
+ZEND_API zend_result zend_get_default_from_internal_arg_info(
 		zval *default_value_zval, const zend_arg_info *arg_info)
 {
 	zend_string *default_value = arg_info->default_value;

Zend/zend_API.h

@@ -930,10 +930,10 @@ ZEND_API bool zend_is_iterable(const zval *iterable);
 
 ZEND_API bool zend_is_countable(const zval *countable);
 
-void zend_convert_internal_arg_info(zend_arg_info *new_arg_info,
+ZEND_API void zend_convert_internal_arg_info(zend_arg_info *new_arg_info,
 		const zend_internal_arg_info *arg_info, bool is_return_info);
 
-ZEND_API zend_result zend_get_default_from_arg_info(
+ZEND_API zend_result zend_get_default_from_internal_arg_info(
 		zval *default_value_zval, const zend_arg_info *arg_info);
 
 END_EXTERN_C()

Zend/zend_compile.c

@@ -4685,7 +4685,7 @@ static uint32_t zend_compile_frameless_icall_ex(znode *result, zend_ast_list *ar
 		} else {
 			zend_arg_info *arg_info = &fbc->common.arg_info[i];
 			arg_zvs[i].op_type = IS_CONST;
-			if (zend_get_default_from_arg_info(&arg_zvs[i].u.constant, arg_info) == FAILURE) {
+			if (zend_get_default_from_internal_arg_info(&arg_zvs[i].u.constant, arg_info) == FAILURE) {
 				ZEND_UNREACHABLE();
 			}
 		}

Zend/zend_execute.c

@@ -5657,7 +5657,7 @@ ZEND_API zend_result ZEND_FASTCALL zend_handle_undef_args(zend_execute_data *cal
 			}
 
 			zval default_value;
-			if (zend_get_default_from_arg_info(&default_value, arg_info) == FAILURE) {
+			if (zend_get_default_from_internal_arg_info(&default_value, arg_info) == FAILURE) {
 				zend_execute_data *old = start_fake_frame(call, NULL);
 				zend_argument_error(zend_ce_argument_count_error, i + 1,
 					"must be passed explicitly, because the default value is not known");

ext/reflection/php_reflection.c

@@ -1648,7 +1648,7 @@ static zend_result get_parameter_default(zval *result, parameter_reference *para
 			/* We don't have a way to determine the default value for this case right now. */
 			return FAILURE;
 		}
-		return zend_get_default_from_arg_info(result, param->arg_info);
+		return zend_get_default_from_internal_arg_info(result, param->arg_info);
 	} else {
 		zval *default_value = get_default_from_recv((zend_op_array *) param->fptr, param->offset);
 		if (!default_value) {