Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix edge cases of object lifetime when signals involved

Browse source
This commit is contained in:
Pedro J. Estébanez 2023-04-11 17:20:03 +02:00
parent 59b8c70007
commit 2f4168daeb
5 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/gdscript/gdscript_byte_codegen.cpp
View file

@ -142,7 +142,9 @@ void GDScriptByteCodeGenerator::pop_temporary() {
if (slot.type == Variant::NIL) {
// Avoid keeping in the stack long-lived references to objects,
// which may prevent RefCounted objects from being freed.
write_assign_false(Address(Address::TEMPORARY, slot_idx));
// However, the cleanup will be performed an the end of the
// statement, to allow object references to survive chaining.
temporaries_pending_clear.push_back(slot_idx);
}
temporaries_pool[slot.type].push_back(slot_idx);
used_temporaries.pop_back();
@ -1752,6 +1754,23 @@ void GDScriptByteCodeGenerator::end_block() {
pop_stack_identifiers();
}
void GDScriptByteCodeGenerator::clean_temporaries() {
List<int>::Element *E = temporaries_pending_clear.front();
while (E) {
// The temporary may have been re-used as something else than an object
// since it was added to the list. In that case, there's no need to clear it.
int slot_idx = E->get();
const StackSlot &slot = temporaries[slot_idx];
if (slot.type == Variant::NIL) {
write_assign_false(Address(Address::TEMPORARY, slot_idx));
}
List<int>::Element *next = E->next();
E->erase();
E = next;
}
}
GDScriptByteCodeGenerator::~GDScriptByteCodeGenerator() {
if (!ended && function != nullptr) {
memdelete(function);