Skip to content

[lldb] Adapt ReflectionContext.cpp to new ExternalDescriptorFinder param #7741

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

Open
wants to merge 1 commit into
base: stable/20230725
Choose a base branch
from
Open

[lldb] Adapt ReflectionContext.cpp to new ExternalDescriptorFinder param #7741

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
12 changes: 7 additions & 5 deletions lldb/source/Plugins/LanguageRuntime/Swift/ReflectionContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ class TargetReflectionContext
swift::remote::TypeInfoProvider *provider) override {
if (!type_ref)
return nullptr;
return m_type_converter.getClassInstanceTypeInfo(type_ref, 0, provider);
return m_type_converter.getClassInstanceTypeInfo(type_ref, 0, provider,
nullptr);
}

const swift::reflection::TypeInfo *
Expand All @@ -108,7 +109,7 @@ class TargetReflectionContext
ss.str().c_str());
}

auto type_info = m_reflection_ctx.getTypeInfo(type_ref, provider);
auto type_info = m_reflection_ctx.getTypeInfo(type_ref, provider, nullptr);
if (log && !type_info) {
std::stringstream ss;
type_ref->dump(ss);
Expand All @@ -131,7 +132,7 @@ class TargetReflectionContext
const swift::reflection::TypeInfo *
GetTypeInfoFromInstance(lldb::addr_t instance,
swift::remote::TypeInfoProvider *provider) override {
return m_reflection_ctx.getInstanceTypeInfo(instance, provider);
return m_reflection_ctx.getInstanceTypeInfo(instance, provider, nullptr);
}

swift::reflection::MemoryReader &GetReader() override {
Expand Down Expand Up @@ -160,7 +161,8 @@ class TargetReflectionContext
// if they need them.'
auto metadata = *md_ptr;
if (fn({[=]() -> const swift::reflection::RecordTypeInfo * {
auto *ti = m_reflection_ctx.getMetadataTypeInfo(metadata, tip);
auto *ti = m_reflection_ctx.getMetadataTypeInfo(metadata, tip,
nullptr);
return llvm::dyn_cast_or_null<
swift::reflection::RecordTypeInfo>(ti);
},
Expand All @@ -181,7 +183,7 @@ class TargetReflectionContext
swift::remote::TypeInfoProvider *provider) override {
int32_t case_idx;
if (m_reflection_ctx.projectEnumValue(enum_addr, enum_type_ref, &case_idx,
provider))
provider, nullptr))
return case_idx;
return {};
}
Expand Down