Merge pull request #73693 from vnen/gdscript-fix-script-signature-check

GDScript: Fix override signature check of script inheritance
godotengine · Feb 21, 2023 · 253396b · 253396b
2 parents 31726fa + 1731010
commit 253396b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp
@@ -1538,6 +1538,7 @@ void GDScriptAnalyzer::resolve_function_signature(GDScriptParser::FunctionNode *
  // Check if the function signature matches the parent. If not it's an error since it breaks polymorphism.
  // Not for the constructor which can vary in signature.
  GDScriptParser::DataType base_type = parser->current_class->base_type;
+ base_type.is_meta_type = false;
  GDScriptParser::DataType parent_return_type;
  List<GDScriptParser::DataType> parameters_types;
  int default_par_count = 0;

diff --git a/modules/gdscript/tests/scripts/analyzer/features/inheritance_signature_check_no_meta.gd b/modules/gdscript/tests/scripts/analyzer/features/inheritance_signature_check_no_meta.gd
@@ -0,0 +1,10 @@
+func test():
+ print("ok")
+
+# https://github.com/godotengine/godot/issues/71994
+class A:
+ extends RefCounted
+class B:
+ extends A
+ func duplicate():
+ pass
diff --git a/modules/gdscript/tests/scripts/analyzer/features/inheritance_signature_check_no_meta.out b/modules/gdscript/tests/scripts/analyzer/features/inheritance_signature_check_no_meta.out
@@ -0,0 +1,2 @@
+GDTEST_OK
+ok