Skip to content

Commit 1cd1614

Browse files
Merge pull request #10855 from adrian-prantl/simplify-url
[lldb] Simplify formatter condition
2 parents 8d66e0f + f4d5477 commit 1cd1614

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

lldb/source/Plugins/Language/Swift/FoundationValueTypes.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,19 +125,15 @@ bool lldb_private::formatters::swift::SwiftURL_SummaryProvider(
125125

126126
std::string base;
127127
ValueObjectSP base_url_sp(valobj.GetChildAtNamePath({g__baseURL}));
128-
if (base_url_sp)
129-
if (ValueObjectSP non_synth_valobj = base_url_sp->GetNonSyntheticValue()) {
130-
const char *value = non_synth_valobj->GetValueAsCString();
131-
if (value && llvm::StringRef(value) != "none")
132-
if (!base_url_sp->GetSummaryAsCString(base, options))
133-
return false;
134-
}
128+
if (base_url_sp && base_url_sp->HasChildren())
129+
if (!base_url_sp->GetSummaryAsCString(base, options))
130+
return false;
135131

136132
std::string summary;
137133
if (!rel_str_sp->GetSummaryAsCString(summary, options))
138134
return false;
139135

140-
// This format matches the implementastion of _SwiftURL.description.
136+
// This format matches the implementation of _SwiftURL.description.
141137
stream << summary;
142138
if (!base.empty())
143139
stream << " -- " << base;

0 commit comments

Comments
 (0)