Skip to content

[lldb][swift] Reduce scope of a SwiftReflectionContext #9765

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.

Sign up for GitHub

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
Dec 19, 2024
Merged

[lldb][swift] Reduce scope of a SwiftReflectionContext #9765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 24 additions & 21 deletions lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1835,31 +1835,34 @@ bool SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress_Class(
return false;
}
Log *log(GetLog(LLDBLog::Types));
ThreadSafeReflectionContext reflection_ctx = GetReflectionContext();
if (!reflection_ctx)
return false;
// Scope reflection_ctx to minimize its lock scope.
{
ThreadSafeReflectionContext reflection_ctx = GetReflectionContext();
if (!reflection_ctx)
return false;

const auto *typeref = reflection_ctx->ReadTypeFromInstance(
instance_ptr, ts->GetDescriptorFinder(), true);
const auto *typeref = reflection_ctx->ReadTypeFromInstance(
instance_ptr, ts->GetDescriptorFinder(), true);

// If we couldn't find the typeref from the instance, the best we can do is
// use the static type. This is a valid use case when the binary doesn't
// contain any metadata (for example, embedded Swift).
if (!typeref)
typeref = reflection_ctx->GetTypeRefOrNull(class_type.GetMangledTypeName(),
ts->GetDescriptorFinder());
// If we couldn't find the typeref from the instance, the best we can do is
// use the static type. This is a valid use case when the binary doesn't
// contain any metadata (for example, embedded Swift).
if (!typeref)
typeref = reflection_ctx->GetTypeRefOrNull(
class_type.GetMangledTypeName(), ts->GetDescriptorFinder());

if (!typeref) {
HEALTH_LOG("could not read typeref for type: {0} (instance_ptr = {0:x})",
class_type.GetMangledTypeName(), instance_ptr);
return false;
if (!typeref) {
HEALTH_LOG("could not read typeref for type: {0} (instance_ptr = {0:x})",
class_type.GetMangledTypeName(), instance_ptr);
return false;
}
swift::Demangle::Demangler dem;
swift::Demangle::NodePointer node = typeref->getDemangling(dem);
CompilerType dynamic_type = ts->RemangleAsType(dem, node);
LLDB_LOG(log, "dynamic type of instance_ptr {0:x} is {1}", instance_ptr,
class_type.GetMangledTypeName());
class_type_or_name.SetCompilerType(dynamic_type);
}
swift::Demangle::Demangler dem;
swift::Demangle::NodePointer node = typeref->getDemangling(dem);
CompilerType dynamic_type = ts->RemangleAsType(dem, node);
LLDB_LOG(log, "dynamic type of instance_ptr {0:x} is {1}", instance_ptr,
class_type.GetMangledTypeName());
class_type_or_name.SetCompilerType(dynamic_type);

#ifndef NDEBUG
if (ModuleList::GetGlobalModuleListProperties()
Expand Down