Skip to content

[lldb][Swift] Propagate address ValueType in GetDynamicAddressAndType_ExistentialMetaType #11071

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
Aug 4, 2025
Merged

[lldb][Swift] Propagate address ValueType in GetDynamicAddressAndType_ExistentialMetaType #11071

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
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 @@ -666,7 +666,7 @@ class SwiftLanguageRuntime : public LanguageRuntime {
bool GetDynamicTypeAndAddress_ExistentialMetatype(
ValueObject &in_value, CompilerType meta_type,
lldb::DynamicValueType use_dynamic, TypeAndOrName &class_type_or_name,
Address &address);
Address &address, Value::ValueType &value_type);

bool GetDynamicTypeAndAddress_Value(ValueObject &in_value,
CompilerType &bound_type,
Expand Down
9 changes: 5 additions & 4 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 @@ -2391,7 +2391,7 @@ bool SwiftLanguageRuntime::GetDynamicTypeAndAddress_Existential(
bool SwiftLanguageRuntime::GetDynamicTypeAndAddress_ExistentialMetatype(
ValueObject &in_value, CompilerType meta_type,
lldb::DynamicValueType use_dynamic, TypeAndOrName &class_type_or_name,
Address &address) {
Address &address, Value::ValueType &value_type) {
// Resolve the dynamic type of the metatype.
AddressType address_type;
lldb::addr_t ptr = in_value.GetPointerValue(&address_type);
Expand Down Expand Up @@ -2437,6 +2437,7 @@ bool SwiftLanguageRuntime::GetDynamicTypeAndAddress_ExistentialMetatype(
tss->GetTypeSystemSwiftTypeRef()->RemangleAsType(dem, wrapped, flavor);
class_type_or_name.SetCompilerType(meta_type);
address.SetRawAddress(ptr);
value_type = Value::ValueType::LoadAddress;
return true;
}

Expand Down Expand Up @@ -3114,10 +3115,10 @@ bool SwiftLanguageRuntime::GetDynamicTypeAndAddress(
success = GetDynamicTypeAndAddress_Class(in_value, val_type, use_dynamic,
class_type_or_name, address,
static_value_type, local_buffer);
else if (type_info.AllSet(eTypeIsMetatype | eTypeIsProtocol))
else if (type_info.AllSet(eTypeIsMetatype | eTypeIsProtocol)) {
success = GetDynamicTypeAndAddress_ExistentialMetatype(
in_value, val_type, use_dynamic, class_type_or_name, address);
else if (type_info.AnySet(eTypeIsProtocol)) {
in_value, val_type, use_dynamic, class_type_or_name, address, static_value_type);
} else if (type_info.AnySet(eTypeIsProtocol)) {
if (type_info.AnySet(eTypeIsObjC))
success = GetDynamicTypeAndAddress_Class(in_value, val_type, use_dynamic,
class_type_or_name, address,
Expand Down