-
Notifications
You must be signed in to change notification settings - Fork 13.4k
[lldb] Remove unused local variables (NFC) #138457
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.
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
kazutakahirata
merged 1 commit into
llvm:main
from
kazutakahirata:cleanup_001_tidy_bugprone-unused-local-non-trivial-variable_lldb
May 4, 2025
Merged
[lldb] Remove unused local variables (NFC) #138457
kazutakahirata
merged 1 commit into
llvm:main
from
kazutakahirata:cleanup_001_tidy_bugprone-unused-local-non-trivial-variable_lldb
May 4, 2025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@llvm/pr-subscribers-lldb Author: Kazu Hirata (kazutakahirata) ChangesFull diff: https://github.com/llvm/llvm-project/pull/138457.diff 13 Files Affected:
diff --git a/lldb/source/Commands/CommandObjectCommands.cpp b/lldb/source/Commands/CommandObjectCommands.cpp
index 9510cf4d14467..10dc273e39ab9 100644
--- a/lldb/source/Commands/CommandObjectCommands.cpp
+++ b/lldb/source/Commands/CommandObjectCommands.cpp
@@ -1537,9 +1537,8 @@ class CommandObjectScriptingObjectParsed : public CommandObjectParsed {
option_def.completion_type = (CommandArgumentType) completion_type;
} else
option_def.completion_type = eNoCompletion;
-
+
// Usage Text:
- std::string usage_text;
obj_sp = opt_dict->GetValueForKey("help");
if (!obj_sp) {
error = Status::FromErrorStringWithFormatv(
diff --git a/lldb/source/Core/FormatEntity.cpp b/lldb/source/Core/FormatEntity.cpp
index 40e247a64b78c..f1c831b7ccc1e 100644
--- a/lldb/source/Core/FormatEntity.cpp
+++ b/lldb/source/Core/FormatEntity.cpp
@@ -2471,7 +2471,6 @@ static void AddMatches(const Definition *def, const llvm::StringRef &prefix,
const size_t n = def->num_children;
if (n > 0) {
for (size_t i = 0; i < n; ++i) {
- std::string match = prefix.str();
if (match_prefix.empty())
matches.AppendString(MakeMatch(prefix, def->children[i].name));
else if (strncmp(def->children[i].name, match_prefix.data(),
diff --git a/lldb/source/DataFormatters/CXXFunctionPointer.cpp b/lldb/source/DataFormatters/CXXFunctionPointer.cpp
index e17659ad0f2f0..d79fb1d678ebd 100644
--- a/lldb/source/DataFormatters/CXXFunctionPointer.cpp
+++ b/lldb/source/DataFormatters/CXXFunctionPointer.cpp
@@ -23,7 +23,6 @@ using namespace lldb_private::formatters;
bool lldb_private::formatters::CXXFunctionPointerSummaryProvider(
ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options) {
- std::string destination;
StreamString sstr;
AddressType func_ptr_address_type = eAddressTypeInvalid;
addr_t func_ptr_address = valobj.GetPointerValue(&func_ptr_address_type);
diff --git a/lldb/source/Expression/DiagnosticManager.cpp b/lldb/source/Expression/DiagnosticManager.cpp
index b1fa14bccc17b..4c0233d467c95 100644
--- a/lldb/source/Expression/DiagnosticManager.cpp
+++ b/lldb/source/Expression/DiagnosticManager.cpp
@@ -83,7 +83,6 @@ std::string DiagnosticManager::GetString(char separator) {
stream << severity;
llvm::StringRef message = diagnostic->GetMessage();
- std::string searchable_message = message.lower();
auto severity_pos = message.find(severity);
stream << message.take_front(severity_pos);
diff --git a/lldb/source/Interpreter/CommandObject.cpp b/lldb/source/Interpreter/CommandObject.cpp
index 7008253e32bca..72dd546dd6523 100644
--- a/lldb/source/Interpreter/CommandObject.cpp
+++ b/lldb/source/Interpreter/CommandObject.cpp
@@ -338,14 +338,11 @@ void CommandObject::HandleArgumentCompletion(
}
-
bool CommandObject::HelpTextContainsWord(llvm::StringRef search_word,
bool search_short_help,
bool search_long_help,
bool search_syntax,
bool search_options) {
- std::string options_usage_help;
-
bool found_word = false;
llvm::StringRef short_help = GetHelp();
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
index adedfa8ece917..d8c7e436f3f8b 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -904,7 +904,6 @@ Status GDBRemoteCommunication::StartDebugserverProcess(
if (!debugserver_file_spec)
return Status::FromErrorString("unable to locate " DEBUGSERVER_BASENAME);
- std::string debugserver_path = debugserver_file_spec.GetPath();
launch_info.SetExecutableFile(debugserver_file_spec,
/*add_exe_file_as_first_arg=*/true);
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
index 748f95c61cd3c..c4c2a8aab3c98 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
@@ -2151,7 +2151,6 @@ bool GDBRemoteCommunicationClient::GetCurrentProcessInfo(bool allow_lazy) {
llvm::StringRef value;
uint32_t cpu = LLDB_INVALID_CPUTYPE;
uint32_t sub = 0;
- std::string arch_name;
std::string os_name;
std::string environment;
std::string vendor_name;
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index f924d1194e8a1..709d09fc887bc 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -2056,7 +2056,6 @@ ProcessGDBRemote::SetThreadStopInfo(StructuredData::Dictionary *thread_dict) {
// Stop with signal and thread info
lldb::tid_t tid = LLDB_INVALID_THREAD_ID;
uint8_t signo = 0;
- std::string value;
std::string thread_name;
std::string reason;
std::string description;
@@ -2276,7 +2275,6 @@ StateType ProcessGDBRemote::SetThreadStopInfo(StringExtractor &stop_packet) {
m_jstopinfo_sp = StructuredData::ParseJSON(json);
} else if (key.compare("hexname") == 0) {
StringExtractor name_extractor(value);
- std::string name;
// Now convert the HEX bytes into a string value
name_extractor.GetHexByteString(thread_name);
} else if (key.compare("name") == 0) {
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
index 16c3226c7f62b..0c864dc85ce71 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@@ -2567,8 +2567,6 @@ bool ScriptInterpreterPythonImpl::RunScriptBasedCommand(
bool ret_val = false;
- std::string err_msg;
-
{
Locker py_lock(this,
Locker::AcquireLock | Locker::InitSession |
@@ -2612,8 +2610,6 @@ bool ScriptInterpreterPythonImpl::RunScriptBasedCommand(
bool ret_val = false;
- std::string err_msg;
-
{
Locker py_lock(this,
Locker::AcquireLock | Locker::InitSession |
@@ -2657,8 +2653,6 @@ bool ScriptInterpreterPythonImpl::RunScriptBasedParsedCommand(
bool ret_val = false;
- std::string err_msg;
-
{
Locker py_lock(this,
Locker::AcquireLock | Locker::InitSession |
@@ -3166,8 +3160,6 @@ void ScriptInterpreterPythonImpl::Initialize() {
void ScriptInterpreterPythonImpl::AddToSysPath(AddLocation location,
std::string path) {
- std::string path_copy;
-
std::string statement;
if (location == AddLocation::Beginning) {
statement.assign("sys.path.insert(0,\"");
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/CompileUnitIndex.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/CompileUnitIndex.cpp
index 25d04f999ad67..46bdd6cd27bf2 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/CompileUnitIndex.cpp
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/CompileUnitIndex.cpp
@@ -177,7 +177,6 @@ CompilandIndexItem &CompileUnitIndex::GetOrCreateCompiland(uint16_t modi) {
// name until we find it, and we can cache that one since the memory is backed
// by a contiguous chunk inside the mapped PDB.
llvm::SmallString<64> main_file = GetMainSourceFile(*cci);
- std::string s = std::string(main_file.str());
llvm::sys::path::native(main_file);
uint32_t file_count = modules.getSourceFileCount(modi);
diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp
index 3e7546048e586..8000cd07565ae 100644
--- a/lldb/source/Target/Platform.cpp
+++ b/lldb/source/Target/Platform.cpp
@@ -492,7 +492,6 @@ Status Platform::Install(const FileSpec &src, const FileSpec &dst) {
// the platform's working directory
if (!fixed_dst.GetDirectory()) {
FileSpec relative_spec;
- std::string path;
if (working_dir) {
relative_spec = working_dir;
relative_spec.AppendPathComponent(dst.GetPath());
diff --git a/lldb/source/Utility/ArchSpec.cpp b/lldb/source/Utility/ArchSpec.cpp
index 2e6c6a6ffcbe4..70b9800f4dade 100644
--- a/lldb/source/Utility/ArchSpec.cpp
+++ b/lldb/source/Utility/ArchSpec.cpp
@@ -1455,7 +1455,6 @@ bool ArchSpec::IsFullySpecifiedTriple() const {
}
bool ArchSpec::IsAlwaysThumbInstructions() const {
- std::string Status;
if (GetTriple().getArch() == llvm::Triple::arm ||
GetTriple().getArch() == llvm::Triple::thumb) {
// v. https://en.wikipedia.org/wiki/ARM_Cortex-M
diff --git a/lldb/unittests/Utility/LogTest.cpp b/lldb/unittests/Utility/LogTest.cpp
index b9b0af4133da9..cd1407263c267 100644
--- a/lldb/unittests/Utility/LogTest.cpp
+++ b/lldb/unittests/Utility/LogTest.cpp
@@ -160,7 +160,6 @@ TEST(LogTest, Unregister) {
llvm::llvm_shutdown_obj obj;
Log::Register("chan", test_channel);
EXPECT_EQ(nullptr, GetLog(TestChannel::FOO));
- std::string message;
auto log_handler_sp = std::make_shared<TestLogHandler>();
EXPECT_TRUE(
Log::EnableLogChannel(log_handler_sp, 0, "chan", {"foo"}, llvm::nulls()));
@@ -214,7 +213,6 @@ TEST(LogHandlerTest, TeeLogHandler) {
TEST_F(LogChannelTest, Enable) {
EXPECT_EQ(nullptr, GetLog(TestChannel::FOO));
- std::string message;
auto log_handler_sp = std::make_shared<TestLogHandler>();
std::string error;
ASSERT_FALSE(EnableChannel(log_handler_sp, 0, "chanchan", {}, error));
@@ -236,7 +234,6 @@ TEST_F(LogChannelTest, Enable) {
TEST_F(LogChannelTest, EnableOptions) {
EXPECT_EQ(nullptr, GetLog(TestChannel::FOO));
- std::string message;
auto log_handler_sp = std::make_shared<TestLogHandler>();
std::string error;
EXPECT_TRUE(EnableChannel(log_handler_sp, LLDB_LOG_OPTION_VERBOSE, "chan", {},
@@ -249,7 +246,6 @@ TEST_F(LogChannelTest, EnableOptions) {
TEST_F(LogChannelTest, Disable) {
EXPECT_EQ(nullptr, GetLog(TestChannel::FOO));
- std::string message;
auto log_handler_sp = std::make_shared<TestLogHandler>();
std::string error;
EXPECT_TRUE(EnableChannel(log_handler_sp, 0, "chan", {"foo", "bar"}, error));
|
arsenm
approved these changes
May 4, 2025
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
GeorgeARM
pushed a commit
to GeorgeARM/llvm-project
that referenced
this pull request
May 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.