Skip to content

[Cherry-pick into next] [lldb] Adapt Swift plugin to changes in CompilerType API #10212

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
Mar 10, 2025
Merged

[Cherry-pick into next] [lldb] Adapt Swift plugin to changes in CompilerType API #10212

Show file tree
Hide file tree
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
24 changes: 16 additions & 8 deletions lldb/source/Expression/Materializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,12 @@ class EntityVariableBase : public Materializer::Entity {
valobj_sp->GetData(data, extract_error);
if (!extract_error.Success()) {
if (valobj_type.GetMinimumLanguage() == lldb::eLanguageTypeSwift) {
std::optional<uint64_t> size =
valobj_type.GetByteSize(frame_sp.get());
if (size && *size == 0) {
auto size_or_err = valobj_type.GetByteSize(frame_sp.get());
if (!size_or_err) {
err = Status::FromError(size_or_err.takeError());
return;
}
if (*size_or_err == 0) {
// We don't need to materialize empty structs in Swift.
return;
}
Expand Down Expand Up @@ -663,14 +666,19 @@ class EntityVariableBase : public Materializer::Entity {

Status extract_error;

map.GetMemoryData(data, m_temporary_allocation,
valobj_sp->GetByteSize().value_or(0), extract_error);
map.GetMemoryData(
data, m_temporary_allocation,
llvm::expectedToOptional(valobj_sp->GetByteSize()).value_or(0),
extract_error);

if (!extract_error.Success()) {
if (valobj_type.GetMinimumLanguage() == lldb::eLanguageTypeSwift) {
std::optional<uint64_t> size =
valobj_type.GetByteSize(frame_sp.get());
if (size && *size == 0)
auto size_or_err = valobj_type.GetByteSize(frame_sp.get());
if (!size_or_err) {
err = Status::FromError(size_or_err.takeError());
return;
}
if (*size_or_err == 0)
// We don't need to dematerialize empty structs in Swift.
return;
}
Expand Down
8 changes: 4 additions & 4 deletions lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1761,8 +1761,8 @@ void SwiftLanguageRuntime::WillStartExecutingUserExpression(
return;
}
ConstString BoolName("bool");
std::optional<uint64_t> bool_size =
ts->GetBuiltinTypeByName(BoolName).GetByteSize(nullptr);
std::optional<uint64_t> bool_size = llvm::expectedToOptional(
ts->GetBuiltinTypeByName(BoolName).GetByteSize(nullptr));
if (!bool_size)
return;

Expand Down Expand Up @@ -1836,8 +1836,8 @@ void SwiftLanguageRuntime::DidFinishExecutingUserExpression(
return;
}
ConstString BoolName("bool");
std::optional<uint64_t> bool_size =
ts->GetBuiltinTypeByName(BoolName).GetByteSize(nullptr);
std::optional<uint64_t> bool_size = llvm::expectedToOptional(
ts->GetBuiltinTypeByName(BoolName).GetByteSize(nullptr));
if (!bool_size)
return;

Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ class SwiftLanguageRuntime : public LanguageRuntime {
ExecutionContext *exe_ctx);

/// Ask Remote Mirrors for the size of a Swift type.
std::optional<uint64_t> GetBitSize(CompilerType type,
llvm::Expected<uint64_t> GetBitSize(CompilerType type,
ExecutionContextScope *exe_scope);

/// Ask Remote mirrors for the stride of a Swift type.
Expand Down
42 changes: 25 additions & 17 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 @@ -381,7 +381,8 @@ class LLDBTypeInfoProvider : public swift::remote::TypeInfoProvider {
return nullptr;
TypeSystemSwiftTypeRef &typesystem = *m_ts;
// Build a TypeInfo for the Clang type.
auto size = clang_type.GetByteSize(exe_scope);
std::optional<uint64_t> size =
llvm::expectedToOptional(clang_type.GetByteSize(exe_scope));
auto bit_align = clang_type.GetTypeBitAlign(exe_scope);
std::vector<swift::reflection::FieldInfo> fields;
if (clang_type.IsAggregateType()) {
Expand Down Expand Up @@ -1214,9 +1215,11 @@ llvm::Expected<CompilerType> SwiftLanguageRuntime::GetChildCompilerTypeAtIndex(
if (auto pack_element_type = ts->GetSILPackElementAtIndex(type, idx)) {
llvm::raw_string_ostream os(child_name);
os << '.' << idx;
child_byte_size =
GetBitSize(pack_element_type, exe_ctx.GetBestExecutionContextScope())
.value_or(0);
auto size_or_err =
GetBitSize(pack_element_type, exe_ctx.GetBestExecutionContextScope());
if (!size_or_err)
return size_or_err.takeError();
child_byte_size = *size_or_err;
int stack_dir = -1;
child_byte_offset = ts->GetPointerByteSize() * idx * stack_dir;
child_bitfield_bit_size = 0;
Expand Down Expand Up @@ -2203,7 +2206,9 @@ bool SwiftLanguageRuntime::GetDynamicTypeAndAddress_Existential(


if (use_local_buffer)
PushLocalBuffer(existential_address, in_value.GetByteSize().value_or(0));
PushLocalBuffer(
existential_address,
llvm::expectedToOptional(in_value.GetByteSize()).value_or(0));

swift::remote::RemoteAddress remote_existential(existential_address);

Expand Down Expand Up @@ -2451,7 +2456,7 @@ CompilerType SwiftLanguageRuntime::BindGenericTypeParameters(
LLDB_LOG_ERROR(
GetLog(LLDBLog::Expressions | LLDBLog::Types),
type_ref_or_err.takeError(),
"Couldn't get rype ref when binding generic type parameters: {0}");
"Couldn't get type ref when binding generic type parameters: {0}");
failure = true;
return;
}
Expand Down Expand Up @@ -2616,8 +2621,8 @@ bool SwiftLanguageRuntime::GetDynamicTypeAndAddress_Value(
ExecutionContextScope *exe_scope = exe_ctx.GetBestExecutionContextScope();
if (!exe_scope)
return false;
std::optional<uint64_t> size =
bound_type.GetByteSize(exe_ctx.GetBestExecutionContextScope());
std::optional<uint64_t> size = llvm::expectedToOptional(
bound_type.GetByteSize(exe_ctx.GetBestExecutionContextScope()));
if (!size)
return false;
AddressType address_type;
Expand All @@ -2633,7 +2638,8 @@ bool SwiftLanguageRuntime::GetDynamicTypeAndAddress_Value(
if (in_value_buffer.empty())
return false;
// If the dynamic type doesn't in the buffer we can't use it either.
if (in_value_buffer.size() < bound_type.GetByteSize(exe_scope))
if (in_value_buffer.size() <
llvm::expectedToOptional(bound_type.GetByteSize(exe_scope)).value_or(0))
return false;

value_type = Value::GetValueTypeFromAddressType(address_type);
Expand Down Expand Up @@ -2739,8 +2745,9 @@ Value::ValueType SwiftLanguageRuntime::GetValueType(
}

if (use_local_buffer)
PushLocalBuffer(existential_address,
in_value.GetByteSize().value_or(0));
PushLocalBuffer(
existential_address,
llvm::expectedToOptional(in_value.GetByteSize()).value_or(0));

// Read the value witness table and check if the data is inlined in
// the existential container or not.
Expand Down Expand Up @@ -3260,7 +3267,10 @@ SwiftLanguageRuntime::GetTypeRef(CompilerType type,
auto type_ref_or_err = reflection_ctx->GetTypeRef(
dem, node, module_holder->GetDescriptorFinder());
if (!type_ref_or_err)
return type_ref_or_err.takeError();
return llvm::joinErrors(
llvm::createStringError("cannot get typeref for type %s",
type.GetMangledTypeName().GetCString()),
type_ref_or_err.takeError());

if (log && log->GetVerbose()) {
std::stringstream ss;
Expand Down Expand Up @@ -3466,14 +3476,12 @@ SwiftLanguageRuntime::ResolveTypeAlias(CompilerType alias) {
return llvm::createStringError("cannot resolve type alias via reflection");
}

std::optional<uint64_t>
llvm::Expected<uint64_t>
SwiftLanguageRuntime::GetBitSize(CompilerType type,
ExecutionContextScope *exe_scope) {
auto type_info_or_err = GetSwiftRuntimeTypeInfo(type, exe_scope);
if (!type_info_or_err) {
LLDB_LOG_ERROR(GetLog(LLDBLog::Types), type_info_or_err.takeError(), "{0}");
return {};
}
if (!type_info_or_err)
return type_info_or_err.takeError();

return type_info_or_err->getSize() * 8;
}
Expand Down
4 changes: 3 additions & 1 deletion lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeRemoteAST.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,9 @@ SwiftLanguageRuntime::GetDynamicTypeAndAddress_ExistentialRemoteAST(
if (!swift_type)
return {};
if (use_local_buffer)
PushLocalBuffer(existential_address, in_value.GetByteSize().value_or(0));
PushLocalBuffer(
existential_address,
llvm::expectedToOptional(in_value.GetByteSize()).value_or(0));

auto result = remote_ast.getDynamicTypeAndAddressForExistential(
remote_existential, swift_type);
Expand Down
Loading