Merge pull request #87222 from RandomShaper/fix_obj_leaks_report

Fix inaccuracies in the report of leaked objects
This commit is contained in:
Rémi Verschelde 2024-03-06 13:16:48 +01:00
commit b85337b7ea
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

@ -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--;
}