caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lldb] Devirtualize GetValueProperties (NFC) (#126583)

Browse Source 
Nobody is overriding GetValueProperties, so in practice we're always
using `m_collection_sp`, which means we don't need to check the pointer.
The temlated helpers were already operating on `m_collection_sp`
directly so this makes the rest of the class consistent.
This commit is contained in:
Jonas Devlieghere
2025-02-11 09:51:18 -08:00
committed by GitHub
parent 55ae118db7
commit 918848d03b
2 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/include/lldb/Core/UserSettingsController.h
View File

@@ -38,9 +38,7 @@ public:
virtual ~Properties();
virtual lldb::OptionValuePropertiesSP GetValueProperties() const {
// This function is virtual in case subclasses want to lazily implement
// creating the properties.
lldb::OptionValuePropertiesSP GetValueProperties() const {
return m_collection_sp;
}

33
lldb/source/Core/UserSettingsController.cpp
View File

@@ -40,64 +40,45 @@ Properties::~Properties() = default;
lldb::OptionValueSP
Properties::GetPropertyValue(const ExecutionContext *exe_ctx,
llvm::StringRef path, Status &error) const {
OptionValuePropertiesSP properties_sp(GetValueProperties());
if (properties_sp)
return properties_sp->GetSubValue(exe_ctx, path, error);
return lldb::OptionValueSP();
return m_collection_sp->GetSubValue(exe_ctx, path, error);
}
Status Properties::SetPropertyValue(const ExecutionContext *exe_ctx,
VarSetOperationType op,
llvm::StringRef path,
llvm::StringRef value) {
OptionValuePropertiesSP properties_sp(GetValueProperties());
if (properties_sp)
return properties_sp->SetSubValue(exe_ctx, op, path, value);
return Status::FromErrorString("no properties");
return m_collection_sp->SetSubValue(exe_ctx, op, path, value);
}
void Properties::DumpAllPropertyValues(const ExecutionContext *exe_ctx,
Stream &strm, uint32_t dump_mask,
bool is_json) {
OptionValuePropertiesSP properties_sp(GetValueProperties());
if (!properties_sp)
return;
if (is_json) {
llvm::json::Value json = properties_sp->ToJSON(exe_ctx);
llvm::json::Value json = m_collection_sp->ToJSON(exe_ctx);
strm.Printf("%s", llvm::formatv("{0:2}", json).str().c_str());
} else
properties_sp->DumpValue(exe_ctx, strm, dump_mask);
m_collection_sp->DumpValue(exe_ctx, strm, dump_mask);
}
void Properties::DumpAllDescriptions(CommandInterpreter &interpreter,
Stream &strm) const {
strm.PutCString("Top level variables:\n\n");
OptionValuePropertiesSP properties_sp(GetValueProperties());
if (properties_sp)
return properties_sp->DumpAllDescriptions(interpreter, strm);
return m_collection_sp->DumpAllDescriptions(interpreter, strm);
}
Status Properties::DumpPropertyValue(const ExecutionContext *exe_ctx,
Stream &strm,
llvm::StringRef property_path,
uint32_t dump_mask, bool is_json) {
OptionValuePropertiesSP properties_sp(GetValueProperties());
if (properties_sp) {
return properties_sp->DumpPropertyValue(exe_ctx, strm, property_path,
return m_collection_sp->DumpPropertyValue(exe_ctx, strm, property_path,
dump_mask, is_json);
}
return Status::FromErrorString("empty property list");
}
size_t
Properties::Apropos(llvm::StringRef keyword,
std::vector<const Property *> &matching_properties) const {
OptionValuePropertiesSP properties_sp(GetValueProperties());
if (properties_sp) {
properties_sp->Apropos(keyword, matching_properties);
}
m_collection_sp->Apropos(keyword, matching_properties);
return matching_properties.size();
}