diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-06 13:16:48 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-06 13:16:48 +0100 |
| commit | b85337b7eaf4ba0217046c126e0f8ea4f7e09ea5 (patch) | |
| tree | 7b6ba2a3e515fee549a2aa9367f6f4d37c697dfb /core | |
| parent | 7307eef89d120338b02f657fbde01365e346211b (diff) | |
| parent | a04a67ead611b6fec2cb9af85e4dfee478fe2a3b (diff) | |
| download | redot-engine-b85337b7eaf4ba0217046c126e0f8ea4f7e09ea5.tar.gz | |
Merge pull request #87222 from RandomShaper/fix_obj_leaks_report
Fix inaccuracies in the report of leaked objects
Diffstat (limited to 'core')
| -rw-r--r-- | core/object/object.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/object/object.cpp b/core/object/object.cpp index b34182cdaa..6a5a9efefa 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -2258,8 +2258,9 @@ void ObjectDB::cleanup() { extra_info = " - Resource path: " + String(resource_get_path->call(obj, nullptr, 0, call_error)); } - uint64_t id = uint64_t(i) | (uint64_t(object_slots[i].validator) << OBJECTDB_VALIDATOR_BITS) | (object_slots[i].is_ref_counted ? OBJECTDB_REFERENCE_BIT : 0); - print_line("Leaked instance: " + String(obj->get_class()) + ":" + itos(id) + extra_info); + uint64_t id = uint64_t(i) | (uint64_t(object_slots[i].validator) << OBJECTDB_SLOT_MAX_COUNT_BITS) | (object_slots[i].is_ref_counted ? OBJECTDB_REFERENCE_BIT : 0); + DEV_ASSERT(id == (uint64_t)obj->get_instance_id()); // We could just use the id from the object, but this check may help catching memory corruption catastrophes. + print_line("Leaked instance: " + String(obj->get_class()) + ":" + uitos(id) + extra_info); count--; } |