godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94025 from dalexeev/gds-fix-implicit-cast-typed-array-param 

GDScript: Fix implicit cast to typed array when passing parameter
This commit is contained in:
Rémi Verschelde 2024-07-09 16:47:20 +02:00
parent ff8050efda b4cb7ec2bb
commit 92320c9b73
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/gdscript/gdscript_vm.cpp
View File

@ -550,9 +550,22 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
return _get_default_variant_for_data_type(return_type);
}
if (argument_types[i].kind == GDScriptDataType::BUILTIN) {
Variant arg;
Variant::construct(argument_types[i].builtin_type, arg, &p_args[i], 1, r_err);
memnew_placement(&stack[i + 3], Variant(arg));
if (argument_types[i].builtin_type == Variant::ARRAY && argument_types[i].has_container_element_type(0)) {
const GDScriptDataType &arg_type = argument_types[i].container_element_types[0];
Array array(p_args[i]->operator Array(), arg_type.builtin_type, arg_type.native_type, arg_type.script_type);
memnew_placement(&stack[i + 3], Variant(array));
} else {
Variant variant;
Variant::construct(argument_types[i].builtin_type, variant, &p_args[i], 1, r_err);
if (unlikely(r_err.error)) {
r_err.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
r_err.argument = i;
r_err.expected = argument_types[i].builtin_type;
call_depth--;
return _get_default_variant_for_data_type(return_type);
}
memnew_placement(&stack[i + 3], Variant(variant));
}
} else {
memnew_placement(&stack[i + 3], Variant(*p_args[i]));
}

7
modules/gdscript/tests/scripts/runtime/features/typed_array_implicit_cast_param.gd Normal file
View File

@ -0,0 +1,7 @@
# GH-93990
func test_param(array: Array[String]) -> void:
print(array.get_typed_builtin() == TYPE_STRING)
func test() -> void:
test_param(PackedStringArray())

2
modules/gdscript/tests/scripts/runtime/features/typed_array_implicit_cast_param.out Normal file
View File

@ -0,0 +1,2 @@
GDTEST_OK
true