Skip to content

[LLDB] Simplify task formatter typesystem creation #11876

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: swift/release/6.3
Choose a base branch
from
Open

[LLDB] Simplify task formatter typesystem creation #11876

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
64 changes: 27 additions & 37 deletions lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,19 +796,7 @@ static std::string mangledTypenameForTasksTuple(size_t count) {
class TaskSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
public:
TaskSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
: SyntheticChildrenFrontEnd(*valobj_sp.get()) {
auto target_sp = m_backend.GetTargetSP();
auto ts_or_err =
target_sp->GetScratchTypeSystemForLanguage(eLanguageTypeSwift);
if (auto err = ts_or_err.takeError()) {
LLDB_LOG_ERROR(GetLog(LLDBLog::DataFormatters | LLDBLog::Types),
std::move(err),
"could not get Swift type system for Task synthetic "
"provider: {0}");
return;
}
m_ts = llvm::dyn_cast_or_null<TypeSystemSwiftTypeRef>(ts_or_err->get());
}
: SyntheticChildrenFrontEnd(*valobj_sp.get()) {}

constexpr static StringLiteral TaskChildren[] = {
// clang-format off
Expand Down Expand Up @@ -840,11 +828,19 @@ class TaskSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
}

lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override {
auto target_sp = m_backend.GetTargetSP();
CompilerType type = m_backend.GetCompilerType();
auto ts = type.GetTypeSystem().dyn_cast_or_null<TypeSystemSwift>();
if (!ts) {
LLDB_LOG(
GetLog(LLDBLog::DataFormatters | LLDBLog::Types),
"could not get Swift type system for Task synthetic provider: {0}",
type.GetMangledTypeName());
return {};
}

// TypeMangling for "Swift.Bool"
CompilerType bool_type =
m_ts->GetTypeFromMangledTypename(ConstString("$sSbD"));
ts->GetTypeFromMangledTypename(ConstString("$sSbD"));

#define RETURN_CHILD(FIELD, NAME, TYPE) \
if (!FIELD) { \
Expand All @@ -861,7 +857,7 @@ class TaskSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
if (!m_address_sp) {
// TypeMangling for "Swift.UnsafeRawPointer"
CompilerType raw_pointer_type =
m_ts->GetTypeFromMangledTypename(ConstString("$sSVD"));
ts->GetTypeFromMangledTypename(ConstString("$sSVD"));

addr_t value = m_task_ptr;
if (auto process_sp = m_backend.GetProcessSP())
Expand All @@ -877,13 +873,13 @@ class TaskSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
case 1: {
// TypeMangling for "Swift.UInt64"
CompilerType uint64_type =
m_ts->GetTypeFromMangledTypename(ConstString("$ss6UInt64VD"));
ts->GetTypeFromMangledTypename(ConstString("$ss6UInt64VD"));
RETURN_CHILD(m_id_sp, id, uint64_type);
}
case 2: {
// TypeMangling for "Swift.TaskPriority"
CompilerType priority_type =
m_ts->GetTypeFromMangledTypename(ConstString("$sScPD"));
ts->GetTypeFromMangledTypename(ConstString("$sScPD"));
RETURN_CHILD(m_enqueue_priority_sp, enqueuePriority, priority_type);
}
case 3: {
Expand All @@ -894,7 +890,7 @@ class TaskSyntheticFrontEnd : public SyntheticChildrenFrontEnd {

// TypeMangling for "Swift.Optional<Swift.UnsafeRawPointer>"
CompilerType raw_pointer_type =
m_ts->GetTypeFromMangledTypename(ConstString("$sSVSgD"));
ts->GetTypeFromMangledTypename(ConstString("$sSVSgD"));

addr_t parent_addr = 0;
if (m_task_info.isChildTask) {
Expand Down Expand Up @@ -937,7 +933,7 @@ class TaskSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
std::string mangled_typename =
mangledTypenameForTasksTuple(tasks.size());
CompilerType tasks_tuple_type =
m_ts->GetTypeFromMangledTypename(ConstString(mangled_typename));
ts->GetTypeFromMangledTypename(ConstString(mangled_typename));
DataExtractor data{tasks.data(), tasks.size() * sizeof(task_type),
endian::InlHostByteOrder(), sizeof(void *)};
m_child_tasks_sp = ValueObject::CreateValueObjectFromData(
Expand Down Expand Up @@ -1026,7 +1022,6 @@ class TaskSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
return {};
}

TypeSystemSwiftTypeRef *m_ts = nullptr;
addr_t m_task_ptr = LLDB_INVALID_ADDRESS;
ReflectionContextInterface::AsyncTaskInfo m_task_info;
ValueObjectSP m_address_sp;
Expand Down Expand Up @@ -1418,20 +1413,6 @@ class ActorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
SwiftLanguageRuntime::FindConcurrencyDebugVersion(*process_sp);

m_is_supported_target = is_64bit && concurrency_version.value_or(0) == 1;
if (!m_is_supported_target)
return;

auto target_sp = m_backend.GetTargetSP();
auto ts_or_err =
target_sp->GetScratchTypeSystemForLanguage(eLanguageTypeSwift);
if (auto err = ts_or_err.takeError()) {
LLDB_LOG_ERROR(GetLog(LLDBLog::DataFormatters | LLDBLog::Types),
std::move(err),
"could not get Swift type system for Task synthetic "
"provider: {0}");
return;
}
m_ts = llvm::dyn_cast_or_null<TypeSystemSwiftTypeRef>(ts_or_err->get());
}

llvm::Expected<uint32_t> CalculateNumChildren() override {
Expand All @@ -1442,11 +1423,21 @@ class ActorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
if (!m_is_supported_target || idx != 0)
return {};

CompilerType type = m_backend.GetCompilerType();
auto ts = type.GetTypeSystem().dyn_cast_or_null<TypeSystemSwift>();
if (!ts) {
LLDB_LOG(
GetLog(LLDBLog::DataFormatters | LLDBLog::Types),
"could not get Swift type system for Actor synthetic provider: {0}",
type.GetMangledTypeName());
return {};
}

if (!m_unprioritised_jobs_sp) {
std::string mangled_typename =
mangledTypenameForTasksTuple(m_job_addrs.size());
CompilerType tasks_tuple_type =
m_ts->GetTypeFromMangledTypename(ConstString(mangled_typename));
ts->GetTypeFromMangledTypename(ConstString(mangled_typename));
DataExtractor data{m_job_addrs.data(),
m_job_addrs.size() * sizeof(addr_t),
endian::InlHostByteOrder(), sizeof(void *)};
Expand Down Expand Up @@ -1556,7 +1547,6 @@ class ActorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {

private:
bool m_is_supported_target = false;
TypeSystemSwiftTypeRef *m_ts = nullptr;
std::vector<addr_t> m_job_addrs;
CompilerType m_task_type;
ValueObjectSP m_unprioritised_jobs_sp;
Expand Down