Skip to content

Commit 7113c80

Browse files
bulbazordbulbazord
authored
[lldb][NFCI] Remove unused parameter from BreakpointResolver*::CreateFromStructuredData (#75374)
These appear to be unused.
1 parent b2cdf3c commit 7113c80

11 files changed

+23
-32
lines changed

‎lldb/include/lldb/Breakpoint/BreakpointResolverAddress.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ class BreakpointResolverAddress : public BreakpointResolver {
3131
~BreakpointResolverAddress() override = default;
3232

3333
static lldb::BreakpointResolverSP
34-
CreateFromStructuredData(const lldb::BreakpointSP &bkpt,
35-
const StructuredData::Dictionary &options_dict,
34+
CreateFromStructuredData(const StructuredData::Dictionary &options_dict,
3635
Status &error);
3736

3837
StructuredData::ObjectSP SerializeToStructuredData() override;

‎lldb/include/lldb/Breakpoint/BreakpointResolverFileLine.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ class BreakpointResolverFileLine : public BreakpointResolver {
2828
std::optional<llvm::StringRef> removed_prefix_opt = std::nullopt);
2929

3030
static lldb::BreakpointResolverSP
31-
CreateFromStructuredData(const lldb::BreakpointSP &bkpt,
32-
const StructuredData::Dictionary &data_dict,
31+
CreateFromStructuredData(const StructuredData::Dictionary &data_dict,
3332
Status &error);
3433

3534
StructuredData::ObjectSP SerializeToStructuredData() override;

‎lldb/include/lldb/Breakpoint/BreakpointResolverFileRegex.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ class BreakpointResolverFileRegex : public BreakpointResolver {
2828
const std::unordered_set<std::string> &func_name_set, bool exact_match);
2929

3030
static lldb::BreakpointResolverSP
31-
CreateFromStructuredData(const lldb::BreakpointSP &bkpt,
32-
const StructuredData::Dictionary &options_dict,
31+
CreateFromStructuredData(const StructuredData::Dictionary &options_dict,
3332
Status &error);
3433

3534
StructuredData::ObjectSP SerializeToStructuredData() override;

‎lldb/include/lldb/Breakpoint/BreakpointResolverName.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ class BreakpointResolverName : public BreakpointResolver {
5151
bool skip_prologue);
5252

5353
static lldb::BreakpointResolverSP
54-
CreateFromStructuredData(const lldb::BreakpointSP &bkpt,
55-
const StructuredData::Dictionary &data_dict,
54+
CreateFromStructuredData(const StructuredData::Dictionary &data_dict,
5655
Status &error);
5756

5857
StructuredData::ObjectSP SerializeToStructuredData() override;

‎lldb/include/lldb/Breakpoint/BreakpointResolverScripted.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ class BreakpointResolverScripted : public BreakpointResolver {
3131
~BreakpointResolverScripted() override = default;
3232

3333
static lldb::BreakpointResolverSP
34-
CreateFromStructuredData(const lldb::BreakpointSP &bkpt,
35-
const StructuredData::Dictionary &options_dict,
34+
CreateFromStructuredData(const StructuredData::Dictionary &options_dict,
3635
Status &error);
3736

3837
StructuredData::ObjectSP SerializeToStructuredData() override;

‎lldb/source/Breakpoint/BreakpointResolver.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,23 +113,23 @@ BreakpointResolverSP BreakpointResolver::CreateFromStructuredData(
113113
switch (resolver_type) {
114114
case FileLineResolver:
115115
result_sp = BreakpointResolverFileLine::CreateFromStructuredData(
116-
nullptr, *subclass_options, error);
116+
*subclass_options, error);
117117
break;
118118
case AddressResolver:
119119
result_sp = BreakpointResolverAddress::CreateFromStructuredData(
120-
nullptr, *subclass_options, error);
120+
*subclass_options, error);
121121
break;
122122
case NameResolver:
123123
result_sp = BreakpointResolverName::CreateFromStructuredData(
124-
nullptr, *subclass_options, error);
124+
*subclass_options, error);
125125
break;
126126
case FileRegexResolver:
127127
result_sp = BreakpointResolverFileRegex::CreateFromStructuredData(
128-
nullptr, *subclass_options, error);
128+
*subclass_options, error);
129129
break;
130130
case PythonResolver:
131131
result_sp = BreakpointResolverScripted::CreateFromStructuredData(
132-
nullptr, *subclass_options, error);
132+
*subclass_options, error);
133133
break;
134134
case ExceptionResolver:
135135
error.SetErrorString("Exception resolvers are hard.");

‎lldb/source/Breakpoint/BreakpointResolverAddress.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ BreakpointResolverAddress::BreakpointResolverAddress(const BreakpointSP &bkpt,
3131
m_addr(addr), m_resolved_addr(LLDB_INVALID_ADDRESS) {}
3232

3333
BreakpointResolverSP BreakpointResolverAddress::CreateFromStructuredData(
34-
const BreakpointSP &bkpt, const StructuredData::Dictionary &options_dict,
35-
Status &error) {
34+
const StructuredData::Dictionary &options_dict, Status &error) {
3635
llvm::StringRef module_name;
3736
lldb::offset_t addr_offset;
3837
FileSpec module_filespec;
@@ -56,7 +55,7 @@ BreakpointResolverSP BreakpointResolverAddress::CreateFromStructuredData(
5655
}
5756
module_filespec.SetFile(module_name, FileSpec::Style::native);
5857
}
59-
return std::make_shared<BreakpointResolverAddress>(bkpt, address,
58+
return std::make_shared<BreakpointResolverAddress>(nullptr, address,
6059
module_filespec);
6160
}
6261

‎lldb/source/Breakpoint/BreakpointResolverFileLine.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ BreakpointResolverFileLine::BreakpointResolverFileLine(
3131
m_removed_prefix_opt(removed_prefix_opt) {}
3232

3333
BreakpointResolverSP BreakpointResolverFileLine::CreateFromStructuredData(
34-
const BreakpointSP &bkpt, const StructuredData::Dictionary &options_dict,
35-
Status &error) {
34+
const StructuredData::Dictionary &options_dict, Status &error) {
3635
llvm::StringRef filename;
3736
uint32_t line;
3837
uint16_t column;
@@ -91,7 +90,7 @@ BreakpointResolverSP BreakpointResolverFileLine::CreateFromStructuredData(
9190
return nullptr;
9291

9392
return std::make_shared<BreakpointResolverFileLine>(
94-
bkpt, offset, skip_prologue, location_spec);
93+
nullptr, offset, skip_prologue, location_spec);
9594
}
9695

9796
StructuredData::ObjectSP

‎lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ BreakpointResolverFileRegex::BreakpointResolverFileRegex(
2727
m_function_names(func_names) {}
2828

2929
BreakpointResolverSP BreakpointResolverFileRegex::CreateFromStructuredData(
30-
const lldb::BreakpointSP &bkpt,
3130
const StructuredData::Dictionary &options_dict, Status &error) {
3231
bool success;
3332

@@ -67,8 +66,8 @@ BreakpointResolverSP BreakpointResolverFileRegex::CreateFromStructuredData(
6766
}
6867
}
6968

70-
return std::make_shared<BreakpointResolverFileRegex>(bkpt, std::move(regex),
71-
names_set, exact_match);
69+
return std::make_shared<BreakpointResolverFileRegex>(
70+
nullptr, std::move(regex), names_set, exact_match);
7271
}
7372

7473
StructuredData::ObjectSP

‎lldb/source/Breakpoint/BreakpointResolverName.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ BreakpointResolverName::BreakpointResolverName(
8787
m_language(rhs.m_language), m_skip_prologue(rhs.m_skip_prologue) {}
8888

8989
BreakpointResolverSP BreakpointResolverName::CreateFromStructuredData(
90-
const BreakpointSP &bkpt, const StructuredData::Dictionary &options_dict,
91-
Status &error) {
90+
const StructuredData::Dictionary &options_dict, Status &error) {
9291
LanguageType language = eLanguageTypeUnknown;
9392
llvm::StringRef language_name;
9493
bool success = options_dict.GetValueForKeyAsString(
@@ -123,7 +122,8 @@ BreakpointResolverSP BreakpointResolverName::CreateFromStructuredData(
123122
GetKey(OptionNames::RegexString), regex_text);
124123
if (success) {
125124
return std::make_shared<BreakpointResolverName>(
126-
bkpt, RegularExpression(regex_text), language, offset, skip_prologue);
125+
nullptr, RegularExpression(regex_text), language, offset,
126+
skip_prologue);
127127
} else {
128128
StructuredData::Array *names_array;
129129
success = options_dict.GetValueForKeyAsArray(
@@ -173,7 +173,7 @@ BreakpointResolverSP BreakpointResolverName::CreateFromStructuredData(
173173

174174
std::shared_ptr<BreakpointResolverName> resolver_sp =
175175
std::make_shared<BreakpointResolverName>(
176-
bkpt, names[0].c_str(), name_masks[0], language,
176+
nullptr, names[0].c_str(), name_masks[0], language,
177177
Breakpoint::MatchType::Exact, offset, skip_prologue);
178178
for (size_t i = 1; i < num_elem; i++) {
179179
resolver_sp->AddNameLookup(ConstString(names[i]), name_masks[i]);

‎lldb/source/Breakpoint/BreakpointResolverScripted.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ void BreakpointResolverScripted::NotifyBreakpointSet() {
5959
}
6060

6161
BreakpointResolverSP BreakpointResolverScripted::CreateFromStructuredData(
62-
const BreakpointSP &bkpt, const StructuredData::Dictionary &options_dict,
63-
Status &error) {
62+
const StructuredData::Dictionary &options_dict, Status &error) {
6463
llvm::StringRef class_name;
6564
bool success;
6665

@@ -79,8 +78,8 @@ BreakpointResolverSP BreakpointResolverScripted::CreateFromStructuredData(
7978
if (options_dict.GetValueForKeyAsDictionary(GetKey(OptionNames::ScriptArgs),
8079
args_dict))
8180
args_data_impl.SetObjectSP(args_dict->shared_from_this());
82-
return std::make_shared<BreakpointResolverScripted>(bkpt, class_name, depth,
83-
args_data_impl);
81+
return std::make_shared<BreakpointResolverScripted>(nullptr, class_name,
82+
depth, args_data_impl);
8483
}
8584

8685
StructuredData::ObjectSP

0 commit comments

Comments
 (0)