Add a few const's (thanks Zachary) and return shared or unique pointers
in places where they help prevent leaks.
llvm-svn: 281288
diff --git a/lldb/source/Breakpoint/Breakpoint.cpp b/lldb/source/Breakpoint/Breakpoint.cpp
index a73b82e..34349f7 100644
--- a/lldb/source/Breakpoint/Breakpoint.cpp
+++ b/lldb/source/Breakpoint/Breakpoint.cpp
@@ -148,8 +148,8 @@
filter_sp.reset(
new SearchFilterForUnconstrainedSearches(target.shared_from_this()));
else {
- filter_sp.reset(SearchFilter::CreateFromStructuredData(target, *filter_dict,
- create_error));
+ filter_sp = SearchFilter::CreateFromStructuredData(target, *filter_dict,
+ create_error);
if (create_error.Fail()) {
error.SetErrorStringWithFormat(
"Error creating breakpoint filter from data: %s.",
@@ -158,13 +158,13 @@
}
}
- BreakpointOptions *options = nullptr;
+ std::unique_ptr<BreakpointOptions> options_up;
StructuredData::Dictionary *options_dict;
success = breakpoint_dict->GetValueForKeyAsDictionary(
BreakpointOptions::GetSerializationKey(), options_dict);
if (success) {
- options = BreakpointOptions::CreateFromStructuredData(*options_dict,
- create_error);
+ options_up = BreakpointOptions::CreateFromStructuredData(*options_dict,
+ create_error);
if (create_error.Fail()) {
error.SetErrorStringWithFormat(
"Error creating breakpoint options from data: %s.",
@@ -174,8 +174,8 @@
}
result_sp =
target.CreateBreakpoint(filter_sp, resolver_sp, false, false, true);
- if (result_sp && options) {
- result_sp->m_options_up.reset(options);
+ if (result_sp && options_up) {
+ result_sp->m_options_up = std::move(options_up);
}
return result_sp;
}
diff --git a/lldb/source/Breakpoint/BreakpointOptions.cpp b/lldb/source/Breakpoint/BreakpointOptions.cpp
index bf24ee0..47b6715 100644
--- a/lldb/source/Breakpoint/BreakpointOptions.cpp
+++ b/lldb/source/Breakpoint/BreakpointOptions.cpp
@@ -45,13 +45,11 @@
stop_on_error);
StructuredData::ArraySP user_source_sp(new StructuredData::Array());
- if (num_strings > 0) {
- for (size_t i = 0; i < num_strings; i++) {
- StructuredData::StringSP item_sp(
- new StructuredData::String(user_source[i]));
- user_source_sp->AddItem(item_sp);
- options_dict_sp->AddItem(GetKey(OptionNames::UserSource), user_source_sp);
- }
+ for (size_t i = 0; i < num_strings; i++) {
+ StructuredData::StringSP item_sp(
+ new StructuredData::String(user_source[i]));
+ user_source_sp->AddItem(item_sp);
+ options_dict_sp->AddItem(GetKey(OptionNames::UserSource), user_source_sp);
}
if (!script_source.empty()) {
@@ -61,9 +59,9 @@
return options_dict_sp;
}
-BreakpointOptions::CommandData *
+std::unique_ptr<BreakpointOptions::CommandData>
BreakpointOptions::CommandData::CreateFromStructuredData(
- StructuredData::Dictionary &options_dict, Error &error) {
+ const StructuredData::Dictionary &options_dict, Error &error) {
std::string script_source;
CommandData *data = new CommandData();
bool success = options_dict.GetValueForKeyAsBoolean(
@@ -84,7 +82,7 @@
data->user_source.AppendString(elem_string);
}
}
- return data;
+ return std::unique_ptr<BreakpointOptions::CommandData>(data);
}
const char *BreakpointOptions::g_option_names
@@ -169,8 +167,8 @@
//----------------------------------------------------------------------
BreakpointOptions::~BreakpointOptions() = default;
-BreakpointOptions *BreakpointOptions::CreateFromStructuredData(
- StructuredData::Dictionary &options_dict, Error &error) {
+std::unique_ptr<BreakpointOptions> BreakpointOptions::CreateFromStructuredData(
+ const StructuredData::Dictionary &options_dict, Error &error) {
bool enabled = true;
bool one_shot = false;
int32_t ignore_count = 0;
@@ -199,7 +197,7 @@
return nullptr;
}
- BreakpointOptions::CommandData *cmd_data = nullptr;
+ std::unique_ptr<CommandData> cmd_data;
StructuredData::Dictionary *cmds_dict;
success = options_dict.GetValueForKeyAsDictionary(
CommandData::GetSerializationKey(), cmds_dict);
@@ -217,8 +215,8 @@
BreakpointOptions *bp_options = new BreakpointOptions(
condition_text.c_str(), enabled, ignore_count, one_shot);
if (cmd_data)
- bp_options->SetCommandDataCallback(cmd_data);
- return bp_options;
+ bp_options->SetCommandDataCallback(cmd_data.release());
+ return std::unique_ptr<BreakpointOptions>(bp_options);
}
StructuredData::ObjectSP BreakpointOptions::SerializeToStructuredData() {
diff --git a/lldb/source/Breakpoint/BreakpointResolver.cpp b/lldb/source/Breakpoint/BreakpointResolver.cpp
index 5a93d57..a7c63c6 100644
--- a/lldb/source/Breakpoint/BreakpointResolver.cpp
+++ b/lldb/source/Breakpoint/BreakpointResolver.cpp
@@ -72,7 +72,7 @@
BreakpointResolver::~BreakpointResolver() {}
BreakpointResolverSP BreakpointResolver::CreateFromStructuredData(
- StructuredData::Dictionary &resolver_dict, Error &error) {
+ const StructuredData::Dictionary &resolver_dict, Error &error) {
BreakpointResolverSP result_sp;
if (!resolver_dict.IsValid()) {
error.SetErrorString("Can't deserialize from an invalid data object.");
diff --git a/lldb/source/Breakpoint/BreakpointResolverAddress.cpp b/lldb/source/Breakpoint/BreakpointResolverAddress.cpp
index cf8637b..a866f61 100644
--- a/lldb/source/Breakpoint/BreakpointResolverAddress.cpp
+++ b/lldb/source/Breakpoint/BreakpointResolverAddress.cpp
@@ -43,7 +43,8 @@
BreakpointResolverAddress::~BreakpointResolverAddress() {}
BreakpointResolver *BreakpointResolverAddress::CreateFromStructuredData(
- Breakpoint *bkpt, StructuredData::Dictionary &options_dict, Error &error) {
+ Breakpoint *bkpt, const StructuredData::Dictionary &options_dict,
+ Error &error) {
std::string module_name;
lldb::addr_t addr_offset;
FileSpec module_filespec;
diff --git a/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp b/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp
index 5f0b0d2..f3f20bc 100644
--- a/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp
+++ b/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp
@@ -37,7 +37,8 @@
BreakpointResolverFileLine::~BreakpointResolverFileLine() {}
BreakpointResolver *BreakpointResolverFileLine::CreateFromStructuredData(
- Breakpoint *bkpt, StructuredData::Dictionary &options_dict, Error &error) {
+ Breakpoint *bkpt, const StructuredData::Dictionary &options_dict,
+ Error &error) {
std::string filename;
uint32_t line_no;
bool check_inlines;
diff --git a/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp b/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp
index da8b7b3..ae2e094 100644
--- a/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp
+++ b/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp
@@ -37,7 +37,8 @@
BreakpointResolverFileRegex::~BreakpointResolverFileRegex() {}
BreakpointResolver *BreakpointResolverFileRegex::CreateFromStructuredData(
- Breakpoint *bkpt, StructuredData::Dictionary &options_dict, Error &error) {
+ Breakpoint *bkpt, const StructuredData::Dictionary &options_dict,
+ Error &error) {
bool success;
std::string regex_string;
diff --git a/lldb/source/Breakpoint/BreakpointResolverName.cpp b/lldb/source/Breakpoint/BreakpointResolverName.cpp
index a946ba3..175eebd 100644
--- a/lldb/source/Breakpoint/BreakpointResolverName.cpp
+++ b/lldb/source/Breakpoint/BreakpointResolverName.cpp
@@ -91,7 +91,8 @@
m_language(rhs.m_language), m_skip_prologue(rhs.m_skip_prologue) {}
BreakpointResolver *BreakpointResolverName::CreateFromStructuredData(
- Breakpoint *bkpt, StructuredData::Dictionary &options_dict, Error &error) {
+ Breakpoint *bkpt, const StructuredData::Dictionary &options_dict,
+ Error &error) {
LanguageType language = eLanguageTypeUnknown;
std::string language_name;
bool success = options_dict.GetValueForKeyAsString(
diff --git a/lldb/source/Core/SearchFilter.cpp b/lldb/source/Core/SearchFilter.cpp
index aa21422..1b6e08e 100644
--- a/lldb/source/Core/SearchFilter.cpp
+++ b/lldb/source/Core/SearchFilter.cpp
@@ -59,12 +59,13 @@
SearchFilter::~SearchFilter() = default;
-SearchFilter *SearchFilter::CreateFromStructuredData(
- Target &target, StructuredData::Dictionary &filter_dict, Error &error) {
- SearchFilter *result = nullptr;
+SearchFilterSP SearchFilter::CreateFromStructuredData(
+ Target &target, const StructuredData::Dictionary &filter_dict,
+ Error &error) {
+ SearchFilterSP result_sp;
if (!filter_dict.IsValid()) {
error.SetErrorString("Can't deserialize from an invalid data object.");
- return result;
+ return result_sp;
}
std::string subclass_name;
@@ -73,14 +74,14 @@
GetSerializationSubclassKey(), subclass_name);
if (!success) {
error.SetErrorStringWithFormat("Filter data missing subclass key");
- return result;
+ return result_sp;
}
FilterTy filter_type = NameToFilterTy(subclass_name.c_str());
if (filter_type == UnknownFilter) {
error.SetErrorStringWithFormat("Unknown filter type: %s.",
subclass_name.c_str());
- return result;
+ return result_sp;
}
StructuredData::Dictionary *subclass_options = nullptr;
@@ -88,24 +89,24 @@
GetSerializationSubclassOptionsKey(), subclass_options);
if (!success || !subclass_options || !subclass_options->IsValid()) {
error.SetErrorString("Filter data missing subclass options key.");
- return result;
+ return result_sp;
}
switch (filter_type) {
case Unconstrained:
- result = SearchFilterForUnconstrainedSearches::CreateFromStructuredData(
+ result_sp = SearchFilterForUnconstrainedSearches::CreateFromStructuredData(
target, *subclass_options, error);
break;
case ByModule:
- result = SearchFilterByModule::CreateFromStructuredData(
+ result_sp = SearchFilterByModule::CreateFromStructuredData(
target, *subclass_options, error);
break;
case ByModules:
- result = SearchFilterByModuleList::CreateFromStructuredData(
+ result_sp = SearchFilterByModuleList::CreateFromStructuredData(
target, *subclass_options, error);
break;
case ByModulesAndCU:
- result = SearchFilterByModuleListAndCU::CreateFromStructuredData(
+ result_sp = SearchFilterByModuleListAndCU::CreateFromStructuredData(
target, *subclass_options, error);
break;
case Exception:
@@ -115,7 +116,7 @@
llvm_unreachable("Should never get an uresolvable filter type.");
}
- return result;
+ return result_sp;
}
bool SearchFilter::ModulePasses(const FileSpec &spec) { return true; }
@@ -312,10 +313,11 @@
// Selects a shared library matching a given file spec, consulting the targets
// "black list".
//----------------------------------------------------------------------
-SearchFilter *SearchFilterForUnconstrainedSearches::CreateFromStructuredData(
- Target &target, StructuredData::Dictionary &data_dict, Error &error) {
+SearchFilterSP SearchFilterForUnconstrainedSearches::CreateFromStructuredData(
+ Target &target, const StructuredData::Dictionary &data_dict, Error &error) {
// No options for an unconstrained search.
- return new SearchFilterForUnconstrainedSearches(target.shared_from_this());
+ return SearchFilterSP(
+ new SearchFilterForUnconstrainedSearches(target.shared_from_this()));
}
StructuredData::ObjectSP
@@ -447,8 +449,8 @@
return ret_sp;
}
-SearchFilter *SearchFilterByModule::CreateFromStructuredData(
- Target &target, StructuredData::Dictionary &data_dict, Error &error) {
+SearchFilterSP SearchFilterByModule::CreateFromStructuredData(
+ Target &target, const StructuredData::Dictionary &data_dict, Error &error) {
StructuredData::Array *modules_array;
bool success = data_dict.GetValueForKeyAsArray(GetKey(OptionNames::ModList),
modules_array);
@@ -472,7 +474,8 @@
}
FileSpec module_spec(module.c_str(), false);
- return new SearchFilterByModule(target.shared_from_this(), module_spec);
+ return SearchFilterSP(
+ new SearchFilterByModule(target.shared_from_this(), module_spec));
}
StructuredData::ObjectSP SearchFilterByModule::SerializeToStructuredData() {
@@ -622,8 +625,8 @@
return ret_sp;
}
-SearchFilter *SearchFilterByModuleList::CreateFromStructuredData(
- Target &target, StructuredData::Dictionary &data_dict, Error &error) {
+SearchFilterSP SearchFilterByModuleList::CreateFromStructuredData(
+ Target &target, const StructuredData::Dictionary &data_dict, Error &error) {
StructuredData::Array *modules_array;
bool success = data_dict.GetValueForKeyAsArray(GetKey(OptionNames::ModList),
modules_array);
@@ -645,7 +648,8 @@
modules.Append(FileSpec(module.c_str(), false));
}
- return new SearchFilterByModuleList(target.shared_from_this(), modules);
+ return SearchFilterSP(
+ new SearchFilterByModuleList(target.shared_from_this(), modules));
}
void SearchFilterByModuleList::SerializeUnwrapped(
@@ -688,14 +692,15 @@
SearchFilterByModuleListAndCU::~SearchFilterByModuleListAndCU() = default;
-SearchFilter *SearchFilterByModuleListAndCU::CreateFromStructuredData(
- Target &target, StructuredData::Dictionary &data_dict, Error &error) {
+lldb::SearchFilterSP SearchFilterByModuleListAndCU::CreateFromStructuredData(
+ Target &target, const StructuredData::Dictionary &data_dict, Error &error) {
StructuredData::Array *modules_array;
+ SearchFilterSP result_sp;
bool success = data_dict.GetValueForKeyAsArray(GetKey(OptionNames::ModList),
modules_array);
if (!success) {
error.SetErrorString("SFBM::CFSD: Could not find the module list key.");
- return nullptr;
+ return result_sp;
}
size_t num_modules = modules_array->GetSize();
@@ -706,7 +711,7 @@
if (!success) {
error.SetErrorStringWithFormat(
"SFBM::CFSD: filter module item %zu not a string.", i);
- return nullptr;
+ return result_sp;
}
modules.Append(FileSpec(module.c_str(), false));
}
@@ -716,7 +721,7 @@
data_dict.GetValueForKeyAsArray(GetKey(OptionNames::CUList), cus_array);
if (!success) {
error.SetErrorString("SFBM::CFSD: Could not find the CU list key.");
- return nullptr;
+ return result_sp;
}
size_t num_cus = cus_array->GetSize();
@@ -732,8 +737,8 @@
cus.Append(FileSpec(cu.c_str(), false));
}
- return new SearchFilterByModuleListAndCU(target.shared_from_this(), modules,
- cus);
+ return SearchFilterSP(new SearchFilterByModuleListAndCU(
+ target.shared_from_this(), modules, cus));
}
StructuredData::ObjectSP
diff --git a/lldb/source/Target/LanguageRuntime.cpp b/lldb/source/Target/LanguageRuntime.cpp
index 83c6afa..24da18f 100644
--- a/lldb/source/Target/LanguageRuntime.cpp
+++ b/lldb/source/Target/LanguageRuntime.cpp
@@ -90,7 +90,7 @@
}
SearchFilter *ExceptionSearchFilter::CreateFromStructuredData(
- Target &target, StructuredData::Dictionary &data_dict, Error &error) {
+ Target &target, const StructuredData::Dictionary &data_dict, Error &error) {
SearchFilter *result = nullptr;
return result;
}