Skip to content

[lldb] Restore ObjC incomplete type dereferencing fix #139567

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
May 12, 2025
Merged

[lldb] Restore ObjC incomplete type dereferencing fix #139567

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
69 changes: 35 additions & 34 deletions lldb/source/ValueObject/ValueObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2810,46 +2810,47 @@ ValueObjectSP ValueObject::Dereference(Status &error) {
std::string deref_error;
if (deref_compiler_type_or_err) {
deref_compiler_type = *deref_compiler_type_or_err;
if (deref_compiler_type && deref_byte_size) {
ConstString deref_name;
if (!deref_name_str.empty())
deref_name.SetCString(deref_name_str.c_str());

m_deref_valobj =
new ValueObjectChild(*this, deref_compiler_type, deref_name,
deref_byte_size, deref_byte_offset, 0, 0, false,
true, eAddressTypeInvalid, language_flags);
}

// In case of incomplete deref compiler type, use the pointee type and try
// to recreate a new ValueObjectChild using it.
if (!m_deref_valobj) {
// FIXME(#59012): C++ stdlib formatters break with incomplete types (e.g.
// `std::vector<int> &`). Remove ObjC restriction once that's resolved.
if (Language::LanguageIsObjC(GetPreferredDisplayLanguage()) &&
HasSyntheticValue()) {
deref_compiler_type = compiler_type.GetPointeeType();

if (deref_compiler_type) {
ConstString deref_name;
if (!deref_name_str.empty())
deref_name.SetCString(deref_name_str.c_str());

m_deref_valobj = new ValueObjectChild(
*this, deref_compiler_type, deref_name, deref_byte_size,
deref_byte_offset, 0, 0, false, true, eAddressTypeInvalid,
language_flags);
}
}
}
} else {
deref_error = llvm::toString(deref_compiler_type_or_err.takeError());
LLDB_LOG(GetLog(LLDBLog::Types), "could not find child: {0}", deref_error);
if (IsSynthetic()) {
m_deref_valobj = GetChildMemberWithName("$$dereference$$").get();
}

if (deref_compiler_type && deref_byte_size) {
ConstString deref_name;
if (!deref_name_str.empty())
deref_name.SetCString(deref_name_str.c_str());

m_deref_valobj =
new ValueObjectChild(*this, deref_compiler_type, deref_name,
deref_byte_size, deref_byte_offset, 0, 0, false,
true, eAddressTypeInvalid, language_flags);
}

// In case of incomplete deref compiler type, use the pointee type and try
// to recreate a new ValueObjectChild using it.
if (!m_deref_valobj) {
// FIXME(#59012): C++ stdlib formatters break with incomplete types (e.g.
// `std::vector<int> &`). Remove ObjC restriction once that's resolved.
if (Language::LanguageIsObjC(GetPreferredDisplayLanguage()) &&
HasSyntheticValue()) {
deref_compiler_type = compiler_type.GetPointeeType();

if (deref_compiler_type) {
ConstString deref_name;
if (!deref_name_str.empty())
deref_name.SetCString(deref_name_str.c_str());

m_deref_valobj = new ValueObjectChild(
*this, deref_compiler_type, deref_name, deref_byte_size,
deref_byte_offset, 0, 0, false, true, eAddressTypeInvalid,
language_flags);
}
}
}

if (!m_deref_valobj && IsSynthetic())
m_deref_valobj = GetChildMemberWithName("$$dereference$$").get();

if (m_deref_valobj) {
error.Clear();
return m_deref_valobj->GetSP();
Expand Down
Loading