asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't pass self when calling a static function from a non-static context

Browse source
This commit is contained in:
Jamie Hill-Daniel 2024-04-04 21:15:17 +00:00
parent 79de2eaae7
commit 164b34a734
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/gdscript/gdscript_analyzer.cpp
View file

@ -3293,6 +3293,7 @@ void GDScriptAnalyzer::reduce_call(GDScriptParser::CallNode *p_call, bool p_is_a
if (get_function_signature(p_call, is_constructor, base_type, p_call->function_name, return_type, par_types, default_arg_count, method_flags)) { if (get_function_signature(p_call, is_constructor, base_type, p_call->function_name, return_type, par_types, default_arg_count, method_flags)) {
// If the method is implemented in the class hierarchy, the virtual flag will not be set for that MethodInfo and the search stops there. // If the method is implemented in the class hierarchy, the virtual flag will not be set for that MethodInfo and the search stops there.
// Virtual check only possible for super() calls because class hierarchy is known. Node/Objects may have scripts attached we don't know of at compile-time. // Virtual check only possible for super() calls because class hierarchy is known. Node/Objects may have scripts attached we don't know of at compile-time.
p_call->is_static = method_flags.has_flag(METHOD_FLAG_STATIC);
if (p_call->is_super && method_flags.has_flag(METHOD_FLAG_VIRTUAL)) { if (p_call->is_super && method_flags.has_flag(METHOD_FLAG_VIRTUAL)) {
push_error(vformat(R"*(Cannot call the parent class' virtual function "%s()" because it hasn't been defined.)*", p_call->function_name), p_call); push_error(vformat(R"*(Cannot call the parent class' virtual function "%s()" because it hasn't been defined.)*", p_call->function_name), p_call);
} }
@ -3311,7 +3312,7 @@ void GDScriptAnalyzer::reduce_call(GDScriptParser::CallNode *p_call, bool p_is_a
base_type.is_meta_type = false; base_type.is_meta_type = false;
} }
if (is_self && static_context && !method_flags.has_flag(METHOD_FLAG_STATIC)) { if (is_self && static_context && !p_call->is_static) {
// Get the parent function above any lambda. // Get the parent function above any lambda.
GDScriptParser::FunctionNode *parent_function = parser->current_function; GDScriptParser::FunctionNode *parent_function = parser->current_function;
while (parent_function && parent_function->source_lambda) { while (parent_function && parent_function->source_lambda) {
@ -3323,10 +3324,10 @@ void GDScriptAnalyzer::reduce_call(GDScriptParser::CallNode *p_call, bool p_is_a
} else { } else {
push_error(vformat(R"*(Cannot call non-static function "%s()" from a static variable initializer.)*", p_call->function_name), p_call); push_error(vformat(R"*(Cannot call non-static function "%s()" from a static variable initializer.)*", p_call->function_name), p_call);
} }
} else if (!is_self && base_type.is_meta_type && !method_flags.has_flag(METHOD_FLAG_STATIC)) { } else if (!is_self && base_type.is_meta_type && !p_call->is_static) {
base_type.is_meta_type = false; // For `to_string()`. base_type.is_meta_type = false; // For `to_string()`.
push_error(vformat(R"*(Cannot call non-static function "%s()" on the class "%s" directly. Make an instance instead.)*", p_call->function_name, base_type.to_string()), p_call); push_error(vformat(R"*(Cannot call non-static function "%s()" on the class "%s" directly. Make an instance instead.)*", p_call->function_name, base_type.to_string()), p_call);
} else if (is_self && !method_flags.has_flag(METHOD_FLAG_STATIC)) { } else if (is_self && !p_call->is_static) {
mark_lambda_use_self(); mark_lambda_use_self();
} }

2
modules/gdscript/gdscript_compiler.cpp
View file

@ -648,7 +648,7 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
// Not exact arguments, but still can use method bind call. // Not exact arguments, but still can use method bind call.
gen->write_call_method_bind(result, self, method, arguments); gen->write_call_method_bind(result, self, method, arguments);
} }
} else if (codegen.is_static || (codegen.function_node && codegen.function_node->is_static) || call->function_name == "new") { } else if (call->is_static || codegen.is_static || (codegen.function_node && codegen.function_node->is_static) || call->function_name == "new") {
GDScriptCodeGenerator::Address self; GDScriptCodeGenerator::Address self;
self.mode = GDScriptCodeGenerator::Address::CLASS; self.mode = GDScriptCodeGenerator::Address::CLASS;
if (is_awaited) { if (is_awaited) {

1
modules/gdscript/gdscript_parser.h
View file

@ -498,6 +498,7 @@ public:
Vector<ExpressionNode *> arguments; Vector<ExpressionNode *> arguments;
StringName function_name; StringName function_name;
bool is_super = false; bool is_super = false;
bool is_static = false;
CallNode() { CallNode() {
type = CALL; type = CALL;