diff options
author | Danil Alexeev <danil@alexeev.xyz> | 2023-05-15 11:17:53 +0300 |
---|---|---|
committer | Danil Alexeev <danil@alexeev.xyz> | 2023-05-15 12:13:52 +0300 |
commit | 7da3110e6b7ad1a1b365eac75bcc71eeb0edd7f9 (patch) | |
tree | 9035d9c67b6c7ceafadbf57b47da8b8ba92683b7 /modules/gdscript/gdscript_analyzer.cpp | |
parent | fb10f45efe52e330496e325b6b7efd0e52f769b0 (diff) | |
download | redot-engine-7da3110e6b7ad1a1b365eac75bcc71eeb0edd7f9.tar.gz |
GDScript: Fix `validate_call_arg()` for unresolved datatype
Diffstat (limited to 'modules/gdscript/gdscript_analyzer.cpp')
-rw-r--r-- | modules/gdscript/gdscript_analyzer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index 9092ae2969..96bd8aafad 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -4837,9 +4837,11 @@ void GDScriptAnalyzer::validate_call_arg(const List<GDScriptParser::DataType> &p } GDScriptParser::DataType arg_type = p_call->arguments[i]->get_datatype(); - if ((arg_type.is_variant() || !arg_type.is_hard_type()) && !(par_type.is_hard_type() && par_type.is_variant())) { - // Argument can be anything, so this is unsafe. - mark_node_unsafe(p_call->arguments[i]); + if (arg_type.is_variant() || !arg_type.is_hard_type()) { + // Argument can be anything, so this is unsafe (unless the parameter is a hard variant). + if (!(par_type.is_hard_type() && par_type.is_variant())) { + mark_node_unsafe(p_call->arguments[i]); + } } else if (par_type.is_hard_type() && !is_type_compatible(par_type, arg_type, true)) { // Supertypes are acceptable for dynamic compliance, but it's unsafe. mark_node_unsafe(p_call); |