Skip to content

Fix TestObjCIvarDiscovery.py, #3247

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
Sep 13, 2021
Merged

Fix TestObjCIvarDiscovery.py, #3247

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
16 changes: 13 additions & 3 deletions lldb/source/Core/ValueObjectChild.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,19 @@ bool ValueObjectChild::UpdateValue() {
m_value.SetValueType(Value::ValueType::FileAddress);
} break;
case eAddressTypeLoad:
m_value.SetValueType(is_instance_ptr_base
? Value::ValueType::Scalar
: Value::ValueType::LoadAddress);
// BEGIN SWIFT MOD
// We need to detect when we cross TypeSystem boundaries,
// e.g. when we try to print Obj-C fields of a Swift object.
if (parent->GetCompilerType().GetTypeSystem()->SupportsLanguage(
lldb::eLanguageTypeSwift) &&
GetCompilerType().GetTypeSystem()->SupportsLanguage(
lldb::eLanguageTypeSwift))
m_value.SetValueType(is_instance_ptr_base
? Value::ValueType::Scalar
: Value::ValueType::LoadAddress);
else
m_value.SetValueType(Value::ValueType::LoadAddress);
// END SWIFT MOD
break;
case eAddressTypeHost:
m_value.SetValueType(Value::ValueType::HostAddress);
Expand Down