Skip to content

[Runtime] Print type names in escape-from-deinit messages. #65693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions stdlib/public/runtime/HeapObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -815,11 +815,16 @@ void swift::swift_deallocClassInstance(HeapObject *object,
size_t allocatedSize,
size_t allocatedAlignMask) {
size_t retainCount = swift_retainCount(object);
if (SWIFT_UNLIKELY(retainCount > 1))
if (SWIFT_UNLIKELY(retainCount > 1)) {
auto descriptor = object->metadata->getTypeContextDescriptor();

swift::fatalError(0,
"Object %p deallocated with retain count %zd, reference "
"may have escaped from deinit.\n",
object, retainCount);
"Object %p of class %s deallocated with retain count %zd, "
"reference may have escaped from deinit.\n",
object,
descriptor ? descriptor->Name.get() : "<unknown>",
retainCount);
}

#if SWIFT_OBJC_INTEROP
// We need to let the ObjC runtime clean up any associated objects or weak
Expand Down