Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-01 14:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

GDScript: Fix incorrect setter call for reference types

Browse source
This commit is contained in:
Danil Alexeev 2024-07-23 22:23:38 +03:00
parent 4e5ed0bbfb
commit 8c82fd15d2
No known key found for this signature in database
GPG key ID: 124453E157DA8DC7
3 changed files with 97 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/gdscript/gdscript_compiler.cpp
View file

@ -1064,6 +1064,8 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
// Get at (potential) root stack pos, so it can be returned.
GDScriptCodeGenerator::Address base = _parse_expression(codegen, r_error, chain.back()->get()->base);
const bool base_known_type = base.type.has_type;
const bool base_is_shared = Variant::is_type_shared(base.type.builtin_type);
if (r_error) {
return GDScriptCodeGenerator::Address();
@ -1074,7 +1076,7 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
// In case the base has a setter, don't use the address directly, as we want to call that setter.
// So use a temp value instead and call the setter at the end.
GDScriptCodeGenerator::Address base_temp;
if (base.mode == GDScriptCodeGenerator::Address::MEMBER && member_property_has_setter && !member_property_is_in_setter) {
if ((!base_known_type || !base_is_shared) && base.mode == GDScriptCodeGenerator::Address::MEMBER && member_property_has_setter && !member_property_is_in_setter) {
base_temp = codegen.add_temporary(base.type);
gen->write_assign(base_temp, base);
prev_base = base_temp;
@ -1229,8 +1231,14 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
}
}
} else if (base_temp.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
if (!base_known_type) {
gen->write_jump_if_shared(base);
}
// Save the temp value back to the base by calling its setter.
gen->write_call(GDScriptCodeGenerator::Address(), base, member_property_setter_function, { assigned });
if (!base_known_type) {
gen->write_end_jump_if_shared();
}
}
if (assigned.mode == GDScriptCodeGenerator::Address::TEMPORARY) {